Mapping to PDB added

[jalview.git] / src / jalview / appletgui / FontChooser.java

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index 02a7471..17fe98a 100755 (executable)
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -27,17 +27,27 @@ public class FontChooser
     extends GFontChooser\r
 {\r
   AlignmentPanel ap;\r
+  TreePanel tp;\r
   Font oldFont;\r
   boolean init = true;\r
   Frame frame;\r
 \r
-  public FontChooser(AlignmentPanel ap, Frame frame)\r
+  public FontChooser(TreePanel tp)\r
   {\r
-    super();\r
-\r
-    this.frame = frame;\r
+    this.tp = tp;\r
+    oldFont = tp.getTreeFont();\r
+    init();\r
+  }\r
 \r
+  public FontChooser(AlignmentPanel ap)\r
+  {\r
     this.ap = ap;\r
+    oldFont = ap.av.getFont();\r
+    init();\r
+  }\r
+\r
+  void init()\r
+    {\r
     String fonts[] = Toolkit.getDefaultToolkit().getFontList();\r
     for (int i = 0; i < fonts.length; i++)\r
     {\r
@@ -53,27 +63,44 @@ public class FontChooser
     fontStyle.addItem("bold");\r
     fontStyle.addItem("italic");\r
 \r
-    oldFont = ap.av.getFont();\r
     fontName.select(oldFont.getName());\r
     fontSize.select(oldFont.getSize() + "");\r
     fontStyle.select(oldFont.getStyle());\r
 \r
+    Frame frame = new Frame();\r
+    this.frame = frame;\r
+    frame.add(this);\r
+    jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 100);\r
+\r
     init = false;\r
   }\r
 \r
   protected void ok_actionPerformed()\r
   {\r
     frame.setVisible(false);\r
-    if (ap.getOverviewPanel() != null)\r
+    if (ap != null)\r
     {\r
-      ap.getOverviewPanel().updateOverviewImage();\r
+      if (ap.getOverviewPanel() != null)\r
+      {\r
+        ap.getOverviewPanel().updateOverviewImage();\r
+      }\r
     }\r
+\r
   }\r
 \r
   protected void cancel_actionPerformed()\r
   {\r
-    ap.av.setFont(oldFont);\r
-    ap.repaint();\r
+    if(ap!=null)\r
+    {\r
+      ap.av.setFont(oldFont);\r
+      ap.repaint();\r
+    }\r
+    else if(tp!=null)\r
+    {\r
+      tp.setTreeFont(oldFont);\r
+      tp.treeCanvas.repaint();\r
+    }\r
+\r
     fontName.select(oldFont.getName());\r
     fontSize.select(oldFont.getSize() + "");\r
     fontStyle.select(oldFont.getStyle());\r
@@ -88,8 +115,15 @@ public class FontChooser
                             Integer.parseInt(fontSize.getSelectedItem().\r
                                              toString())\r
         );\r
-    ap.av.setFont(newFont);\r
-    ap.fontChanged();\r
+    if (ap != null)\r
+    {\r
+      ap.av.setFont(newFont);\r
+      ap.fontChanged();\r
+    }\r
+    else if(tp != null)\r
+    {\r
+      tp.setTreeFont(newFont);\r
+      }\r
   }\r
 \r
   protected void fontName_actionPerformed()\r