search and font frames are now internalframes

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 22c48bc..4209455 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -34,10 +34,17 @@ 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
-    fontNameMenuItem.setText(viewport.getFont().getName());\r
-    fontSizeMenuItem.setText(viewport.getFont().getSize()+"");\r
 \r
     addInternalFrameListener(new InternalFrameAdapter()\r
    {\r
@@ -350,8 +357,18 @@ public class AlignFrame extends GAlignFrame
 \r
      SequenceGroup sg = viewport.getRubberbandGroup();\r
      for (int i=0;i < sg.sequences.size(); i++)\r
-             viewport.getAlignment().deleteSequence(sg.getSequenceAt(i));\r
+     {\r
+       SequenceI seq = sg.getSequenceAt(i);\r
+       int index = viewport.getAlignment().findIndex(seq);\r
+       seq.deleteChars(sg.getStartRes(), sg.getEndRes()+1);\r
+\r
+       if(seq.getSequence().length()<1)\r
+          viewport.getAlignment().deleteSequence(seq);\r
+      else\r
+          viewport.getAlignment().getSequences().setElementAt(seq, index);\r
+     }\r
 \r
+     viewport.setRubberbandGroup(null);\r
      viewport.alignment.deleteGroup(sg);\r
      viewport.resetSeqLimits( alignPanel.seqPanel.seqCanvas.getHeight());\r
      if(viewport.getAlignment().getHeight()<1)\r
@@ -501,65 +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
-  }\r
-\r
-\r
-\r
-  public void fontNameMenuItem_actionPerformed(ActionEvent e)\r
-  {\r
-    String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();\r
-\r
-\r
-    String selection = JOptionPane.showInternalInputDialog(this,\r
-                                "Select font",\r
-                                "Font selection",\r
-                                JOptionPane.QUESTION_MESSAGE,\r
-                                null,fonts\r
-                                ,fontNameMenuItem.getText()).toString();\r
-    if(selection!=null)\r
-    {\r
-       fontNameMenuItem.setText(selection);\r
-       SetFont();\r
-     }\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
-  public void fontSizeMenuItem_actionPerformed(ActionEvent e)\r
-  {\r
-    String selection = JOptionPane.showInternalInputDialog(this,\r
-                                "Select font size",\r
-                                "Font size",\r
-                                JOptionPane.QUESTION_MESSAGE,\r
-                                null, new String[]{"1","2","4","6","8","10","12","14","16","18","20"}\r
-                                ,fontSizeMenuItem.getText()).toString();\r
-    if(selection!=null)\r
-     {\r
-       fontSizeMenuItem.setText(selection);\r
-       SetFont();\r
-     }\r
-  }\r
 \r
-  public void fontStyleMenuItem_actionPerformed(ActionEvent e)\r
+  public void font_actionPerformed(ActionEvent e)\r
   {\r
-    String selection = JOptionPane.showInternalInputDialog(this,\r
-                                "Select font style",\r
-                                "Font style",\r
-                                JOptionPane.QUESTION_MESSAGE,\r
-                                null, new String[]{"plain", "bold", "italic"}\r
-                                ,fontStyleMenuItem.getText()).toString();\r
-    if(selection!=null)\r
-    {\r
-      fontStyleMenuItem.setText(selection);\r
-      SetFont();\r
-    }\r
-\r
+   // JOptionPane op = new JOptionPane();\r
+    JInternalFrame frame = new JInternalFrame();\r
+    FontChooser fc = new FontChooser( alignPanel, frame );\r
+    frame.setContentPane(fc);\r
+    Desktop.addInternalFrame(frame, "Change Font", 480,100);\r
   }\r
 \r
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)\r
@@ -568,21 +541,6 @@ public class AlignFrame extends GAlignFrame
       alignPanel.RefreshPanels();\r
   }\r
 \r
-  void SetFont()\r
-  {\r
-      int style = java.awt.Font.PLAIN;\r
-      if(fontStyleMenuItem.getText().equals("bold"))\r
-        style = java.awt.Font.BOLD;\r
-      else if(fontStyleMenuItem.getText().equals("italic"))\r
-        style = java.awt.Font.ITALIC;\r
-\r
-      viewport.setFont(new java.awt.Font(fontNameMenuItem.getText(),\r
-                                           style,\r
-                                           Integer.parseInt(fontSizeMenuItem.getText())));\r
-      alignPanel.RefreshPanels();\r
-\r
-  }\r
-\r
   protected void wrapMenuItem_actionPerformed(ActionEvent e)\r
   {\r
     viewport.setWrapAlignment( wrapMenuItem.isSelected() );\r