search and font frames are now internalframes

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 9566bb5..4209455 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -34,6 +34,15 @@ public class AlignFrame extends GAlignFrame
   {\r
     super();\r
     viewport = new AlignViewport(al,true,true,true,false);\r
+\r
+    String fontName = jalview.bin.Cache.getProperty("FONT_NAME");\r
+    String fontStyle= jalview.bin.Cache.getProperty("FONT_STYLE");\r
+    String fontSize = jalview.bin.Cache.getProperty("FONT_SIZE");\r
+    if(fontName!=null && fontStyle!=null && fontSize!=null)\r
+      viewport.setFont( new Font(fontName,Integer.parseInt(fontStyle),Integer.parseInt(fontSize)) );\r
+\r
+\r
+\r
     alignPanel = new AlignmentPanel(this, viewport);\r
     getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);\r
 \r
@@ -509,25 +518,21 @@ public class AlignFrame extends GAlignFrame
 \r
   public void findMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-    JOptionPane op = new JOptionPane();\r
-    JInternalFrame frame =  op.createInternalFrame(this, "Find");\r
-    Finder finder = new Finder(viewport, alignPanel, frame);\r
-    frame.setClosable(true);\r
-    frame.setContentPane(finder);\r
-    frame.setSize(340,110);\r
-    frame.setVisible(true);\r
+      JInternalFrame frame = new JInternalFrame();\r
+      Finder finder = new Finder(viewport, alignPanel, frame);\r
+      frame.setContentPane(finder);\r
+     Desktop.addInternalFrame(frame, "Find", 340,110);\r
+\r
   }\r
 \r
 \r
   public void font_actionPerformed(ActionEvent e)\r
   {\r
-    JOptionPane op = new JOptionPane();\r
-    JInternalFrame frame = op.createInternalFrame(this, "Change Font");\r
-    FontChooser fc = new FontChooser( alignPanel );\r
-    frame.setClosable(true);\r
+   // JOptionPane op = new JOptionPane();\r
+    JInternalFrame frame = new JInternalFrame();\r
+    FontChooser fc = new FontChooser( alignPanel, frame );\r
     frame.setContentPane(fc);\r
-    frame.setSize(480, 100);\r
-    frame.setVisible(true);\r
+    Desktop.addInternalFrame(frame, "Change Font", 480,100);\r
   }\r
 \r
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)\r