GPL license added

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

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