Use a label with html instead of textarea

[jalview.git] / src / jalview / jbgui / GAlignFrame.java

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 1cbe15c..3c4d1b5 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -125,6 +125,10 @@ public class GAlignFrame
 \r
   JMenuItem associatedData = new JMenuItem();\r
   protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem();\r
+  JMenu addSequenceMenu = new JMenu();\r
+  JMenuItem addFromFile = new JMenuItem();\r
+  JMenuItem addFromText = new JMenuItem();\r
+  JMenuItem addFromURL = new JMenuItem();\r
   public GAlignFrame()\r
   {\r
 \r
@@ -896,6 +900,7 @@ public class GAlignFrame
 \r
     jMenu2.setText("Export");\r
     padGapsMenuitem.setText("Pad Gaps");\r
+    padGapsMenuitem.setState( jalview.bin.Cache.getDefault("PAD_GAPS", false));\r
     padGapsMenuitem.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -979,7 +984,7 @@ public class GAlignFrame
       }\r
     });\r
     autoCalculate.setText("Autocalculate Consensus");\r
-    autoCalculate.setState(true);\r
+    autoCalculate.setState( jalview.bin.Cache.getDefault("AUTO_CALC_CONSENSUS", true));\r
     autoCalculate.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -987,6 +992,31 @@ public class GAlignFrame
         autoCalculate_actionPerformed(e);\r
       }\r
     });\r
+    addSequenceMenu.setText("Add Sequences");\r
+    addFromFile.setText("From File");\r
+    addFromFile.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        addFromFile_actionPerformed(e);\r
+      }\r
+    });\r
+    addFromText.setText("From Textbox");\r
+    addFromText.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        addFromText_actionPerformed(e);\r
+      }\r
+    });\r
+    addFromURL.setText("From URL");\r
+    addFromURL.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        addFromURL_actionPerformed(e);\r
+      }\r
+    });\r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
     alignFrameMenuBar.add(searchMenu);\r
@@ -994,6 +1024,7 @@ public class GAlignFrame
     alignFrameMenuBar.add(colourMenu);\r
     alignFrameMenuBar.add(calculateMenu);\r
     alignFrameMenuBar.add(webService);\r
+    fileMenu.add(addSequenceMenu);\r
     fileMenu.add(fetchSequence);\r
     fileMenu.addSeparator();\r
     fileMenu.add(vamsasStore);\r
@@ -1077,7 +1108,6 @@ public class GAlignFrame
     webServiceNoServices=new JMenuItem("<No Services>");\r
     webService.add(webServiceNoServices);\r
     this.getContentPane().add(statusBar, BorderLayout.SOUTH);\r
-  //  this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER);\r
     jMenu1.add(pasteNew);\r
     jMenu1.add(pasteThis);\r
     sort.add(sortIDMenuItem);\r
@@ -1090,6 +1120,9 @@ public class GAlignFrame
     jMenu2.add(htmlMenuItem);\r
     jMenu2.add(epsFile);\r
     jMenu2.add(createPNG);\r
+    addSequenceMenu.add(addFromFile);\r
+    addSequenceMenu.add(addFromText);\r
+    addSequenceMenu.add(addFromURL);\r
   }\r
 \r
   protected void outputText_actionPerformed(ActionEvent e)\r
@@ -1418,4 +1451,19 @@ public class GAlignFrame
   {\r
 \r
   }\r
+\r
+  public void addFromFile_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void addFromText_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void addFromURL_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r