Highlight feature to edit

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

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 6d3f073..f0d307b 100755 (executable)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -32,6 +32,8 @@ import javax.swing.*;
 \r
 import java.util.Vector;\r
 import jalview.io.FormatAdapter;\r
+import javax.swing.event.ChangeListener;\r
+import javax.swing.event.ChangeEvent;\r
 \r
 \r
 /**\r
@@ -81,6 +83,8 @@ public class PopupMenu extends JPopupMenu
   JMenuItem discoverPDB = new JMenuItem();\r
   JMenu outputMenu = new JMenu();\r
   JMenuItem sequenceFeature = new JMenuItem();\r
+  JMenuItem textColour = new JMenuItem();\r
+  JMenu jMenu1 = new JMenu();\r
 \r
   /**\r
      * Creates a new PopupMenu object.\r
@@ -510,23 +514,25 @@ public class PopupMenu extends JPopupMenu
         sequenceFeature_actionPerformed(e);\r
       }\r
     });\r
+    textColour.setText("Text Colour");\r
+    textColour.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        textColour_actionPerformed(e);\r
+      }\r
+    });\r
+    jMenu1.setText("Group");\r
     add(groupMenu);\r
 \r
     add(sequenceMenu);\r
     groupMenu.add(editMenu);\r
     groupMenu.add(outputMenu);\r
-    groupMenu.addSeparator();\r
     groupMenu.add(sequenceFeature);\r
-    groupMenu.addSeparator();\r
-    groupMenu.add(groupName);\r
-    groupMenu.add(unGroupMenuItem);\r
-    groupMenu.add(colourMenu);\r
-    groupMenu.add(showBoxes);\r
-    groupMenu.add(showText);\r
-    groupMenu.add(showColourText);\r
-    groupMenu.add(outline);\r
+    groupMenu.add(jMenu1);\r
     sequenceMenu.add(sequenceName);\r
     sequenceMenu.add(pdbMenu);\r
+    colourMenu.add(textColour);\r
     colourMenu.add(noColourmenuItem);\r
         colourMenu.add(clustalColour);\r
         colourMenu.add(BLOSUM62Colour);\r
@@ -573,6 +579,13 @@ public class PopupMenu extends JPopupMenu
     pdbMenu.add(pdbFromFile);\r
     pdbMenu.add(enterPDB);\r
     pdbMenu.add(discoverPDB);\r
+    jMenu1.add(groupName);\r
+    jMenu1.add(unGroupMenuItem);\r
+    jMenu1.add(colourMenu);\r
+    jMenu1.add(showBoxes);\r
+    jMenu1.add(showText);\r
+    jMenu1.add(showColourText);\r
+    jMenu1.add(outline);\r
     noColourmenuItem.setText("None");\r
         noColourmenuItem.addActionListener(new java.awt.event.ActionListener()\r
             {\r
@@ -952,31 +965,6 @@ public class PopupMenu extends JPopupMenu
         groupName.setText(reply);\r
     }\r
 \r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param e DOCUMENT ME!\r
-     */\r
-    protected void analyze_actionPerformed(ActionEvent e)\r
-    {\r
-        CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
-        JInternalFrame frame = new JInternalFrame();\r
-        frame.setContentPane(cap);\r
-        Desktop.addInternalFrame(frame, "Analyze this - ", 400, 300);\r
-\r
-        SequenceGroup sg = getGroup();\r
-        StringBuffer sb = new StringBuffer();\r
-\r
-        for (int i = 0; i < sg.getSize(false); i++)\r
-        {\r
-            Sequence tmp = (Sequence) sg.getSequences(false).elementAt(i);\r
-            sb.append(tmp.getSequence(sg.getStartRes(), sg.getEndRes() + 1));\r
-            sb.append("\n");\r
-        }\r
-\r
-        sb.append("Something amazing will happen soon");\r
-        cap.setText(sb.toString());\r
-    }\r
 \r
     /**\r
      * DOCUMENT ME!\r
@@ -1255,6 +1243,7 @@ public class PopupMenu extends JPopupMenu
   public void outputText_actionPerformed(ActionEvent e)\r
   {\r
     CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
+    cap.setForInput(null);\r
     Desktop.addInternalFrame(cap,\r
                              "Alignment output - " + e.getActionCommand(), 600,\r
                              500);\r
@@ -1368,4 +1357,11 @@ public class PopupMenu extends JPopupMenu
       ap.highlightSearchResults(null);\r
     }\r
   }\r
+\r
+  public void textColour_actionPerformed(ActionEvent e)\r
+  {\r
+    SequenceGroup sg = getGroup();\r
+    if (sg != null)\r
+      new TextColourChooser().chooseColour(ap, sg);\r
+  }\r
 }\r