remove new line in alquality

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

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 6f21199..1cbe15c 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -86,7 +86,7 @@ public class GAlignFrame
   JMenuItem findMenuItem = new JMenuItem();\r
   JMenu searchMenu = new JMenu();\r
   public JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem();\r
-  public JCheckBoxMenuItem sequenceFeatures = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem();\r
   protected JRadioButtonMenuItem nucleotideColour = new JRadioButtonMenuItem();\r
   JMenuItem deleteGroups = new JMenuItem();\r
   JMenuItem delete = new JMenuItem();\r
@@ -110,7 +110,7 @@ public class GAlignFrame
   protected JMenu sort = new JMenu();\r
   JMenu calculate = new JMenu();\r
   JMenu jMenu2 = new JMenu();\r
-  JMenuItem padGapsMenuitem = new JMenuItem();\r
+  protected JCheckBoxMenuItem padGapsMenuitem = new JCheckBoxMenuItem();\r
   protected ButtonGroup colours = new ButtonGroup();\r
   JMenuItem vamsasStore = new JMenuItem();\r
   protected JCheckBoxMenuItem showTranslation = new JCheckBoxMenuItem();\r
@@ -119,7 +119,12 @@ public class GAlignFrame
   JMenuItem fetchSequence = new JMenuItem();\r
   protected JCheckBoxMenuItem smoothFont = new JCheckBoxMenuItem();\r
   JMenuItem annotationColour = new JMenuItem();\r
+  JMenuItem fetchSeqFeatures = new JMenuItem();\r
 \r
+\r
+\r
+  JMenuItem associatedData = new JMenuItem();\r
+  protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem();\r
   public GAlignFrame()\r
   {\r
 \r
@@ -709,12 +714,12 @@ public class GAlignFrame
         abovePIDThreshold_actionPerformed(e);\r
       }\r
     });\r
-    sequenceFeatures.setText("Sequence Features");\r
-    sequenceFeatures.addActionListener(new ActionListener()\r
+    showSeqFeatures.setText("Show Sequence Features");\r
+    showSeqFeatures.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent actionEvent)\r
       {\r
-        sequenceFeatures_actionPerformed(actionEvent);\r
+        showSeqFeatures_actionPerformed(actionEvent);\r
       }\r
     });\r
     nucleotideColour.setText("Nucleotide");\r
@@ -924,7 +929,6 @@ public class GAlignFrame
             tabSelected();\r
           }\r
         });*/\r
-    featureSettings.setEnabled(false);\r
     featureSettings.setText("Feature Settings...");\r
     featureSettings.addActionListener(new ActionListener()\r
     {\r
@@ -933,7 +937,7 @@ public class GAlignFrame
         featureSettings_actionPerformed(e);\r
       }\r
     });\r
-    fetchSequence.setText("Fetch Sequence...");\r
+    fetchSequence.setText("Fetch Sequence(s)...");\r
     fetchSequence.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -958,6 +962,31 @@ public class GAlignFrame
         annotationColour_actionPerformed(e);\r
       }\r
     });\r
+    fetchSeqFeatures.setText("Fetch Sequence Features");\r
+    fetchSeqFeatures.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        fetchSeqFeatures_actionPerformed(e);\r
+      }\r
+    });\r
+    associatedData.setText("Load Features / Annotations");\r
+    associatedData.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        associatedData_actionPerformed(e);\r
+      }\r
+    });\r
+    autoCalculate.setText("Autocalculate Consensus");\r
+    autoCalculate.setState(true);\r
+    autoCalculate.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        autoCalculate_actionPerformed(e);\r
+      }\r
+    });\r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
     alignFrameMenuBar.add(searchMenu);\r
@@ -966,6 +995,7 @@ public class GAlignFrame
     alignFrameMenuBar.add(calculateMenu);\r
     alignFrameMenuBar.add(webService);\r
     fileMenu.add(fetchSequence);\r
+    fileMenu.addSeparator();\r
     fileMenu.add(vamsasStore);\r
     fileMenu.add(saveAlignmentMenu);\r
     fileMenu.add(jMenu2);\r
@@ -973,6 +1003,7 @@ public class GAlignFrame
     fileMenu.add(printMenuItem);\r
     fileMenu.addSeparator();\r
     fileMenu.add(LoadtreeMenuItem);\r
+    fileMenu.add(associatedData);\r
     fileMenu.addSeparator();\r
     fileMenu.add(closeMenuItem);\r
     editMenu.add(undoMenuItem);\r
@@ -1009,13 +1040,13 @@ public class GAlignFrame
     viewMenu.add(renderGapsMenuItem);\r
     viewMenu.add(annotationPanelMenuItem);\r
     viewMenu.addSeparator();\r
-    viewMenu.add(sequenceFeatures);\r
+    viewMenu.add(fetchSeqFeatures);\r
+    viewMenu.add(showSeqFeatures);\r
     viewMenu.add(featureSettings);\r
     viewMenu.addSeparator();\r
     viewMenu.add(overviewMenuItem);\r
     colourMenu.add(applyToAllGroups);\r
     colourMenu.addSeparator();\r
-    colourMenu.add(annotationColour);\r
     colourMenu.add(noColourmenuItem);\r
     colourMenu.add(clustalColour);\r
     colourMenu.add(BLOSUM62Colour);\r
@@ -1034,7 +1065,7 @@ public class GAlignFrame
     colourMenu.add(modifyConservation);\r
     colourMenu.add(abovePIDThreshold);\r
     colourMenu.add(modifyPID);\r
-    colourMenu.addSeparator();\r
+    colourMenu.add(annotationColour);\r
     calculateMenu.add(sort);\r
     calculateMenu.add(calculate);\r
     calculateMenu.addSeparator();\r
@@ -1042,6 +1073,7 @@ public class GAlignFrame
     calculateMenu.add(PCAMenuItem);\r
     calculateMenu.addSeparator();\r
     calculateMenu.add(showTranslation);\r
+    calculateMenu.add(autoCalculate);\r
     webServiceNoServices=new JMenuItem("<No Services>");\r
     webService.add(webServiceNoServices);\r
     this.getContentPane().add(statusBar, BorderLayout.SOUTH);\r
@@ -1240,7 +1272,7 @@ public class GAlignFrame
   {\r
   }\r
 \r
-  public void sequenceFeatures_actionPerformed(ActionEvent actionEvent)\r
+  public void showSeqFeatures_actionPerformed(ActionEvent actionEvent)\r
   {\r
   }\r
 \r
@@ -1352,11 +1384,6 @@ public class GAlignFrame
 \r
   }\r
 \r
-  public void tabSelected()\r
-  {\r
-\r
-  }\r
-\r
   public void featureSettings_actionPerformed(ActionEvent e)\r
   {\r
 \r
@@ -1376,4 +1403,19 @@ public class GAlignFrame
   {\r
 \r
   }\r
+\r
+  public void fetchSeqFeatures_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void associatedData_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void autoCalculate_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r