From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 25 Jul 2006 12:57:37 +0000 (+0000)
Subject: Reorder popupmenu
X-Git-Tag: Release_2_1~216
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=821c04574cbf7c2d5ba5e80b9319ca7304317d58;p=jalview.git

Reorder popupmenu
---

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 018c1c2..5a98d55 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -77,11 +77,11 @@ public class PopupMenu extends JPopupMenu
   JMenuItem upperCase = new JMenuItem();
   JMenuItem lowerCase = new JMenuItem();
   JMenuItem toggle = new JMenuItem();
-  JMenu outputMenu = new JMenu();
   JMenu pdbMenu = new JMenu();
   JMenuItem pdbFromFile = new JMenuItem();
   JMenuItem enterPDB = new JMenuItem();
   JMenuItem discoverPDB = new JMenuItem();
+  JMenuItem jMenuItem1 = new JMenuItem();
 
   /**
      * Creates a new PopupMenu object.
@@ -128,8 +128,7 @@ public class PopupMenu extends JPopupMenu
             }
           });
 
-          outputMenu.add(item);
-        }
+    }
 
 
         try
@@ -144,6 +143,9 @@ public class PopupMenu extends JPopupMenu
 
         if (seq != null)
         {
+          int start = Math.max(sequence.getName().length()-15, 0);
+          sequenceMenu.setText(sequence.getName().substring(start));
+
           JMenuItem menuItem;
           if( seq.getDatasetSequence().getPDBId() != null)
           {
@@ -175,7 +177,7 @@ public class PopupMenu extends JPopupMenu
                   hideSequences(false);
                 }
               });
-          sequenceMenu.add(menuItem);
+          add(menuItem);
 
           if(ap.av.getSelectionGroup() !=null
              && ap.av.getSelectionGroup().getSize(false)>1)
@@ -198,7 +200,7 @@ public class PopupMenu extends JPopupMenu
             if (ap.av.adjustForHiddenSeqs(index) -
                 ap.av.adjustForHiddenSeqs(index - 1) > 1)
             {
-              menuItem = new JMenuItem("Reveal");
+              menuItem = new JMenuItem("Reveal Sequences");
               menuItem.addActionListener(new ActionListener()
               {
                 public void actionPerformed(ActionEvent e)
@@ -209,7 +211,7 @@ public class PopupMenu extends JPopupMenu
                     ap.overviewPanel.updateOverviewImage();
                 }
               });
-              sequenceMenu.add(menuItem);
+              add(menuItem);
             }
 
             menuItem = new JMenuItem("Reveal All");
@@ -224,10 +226,7 @@ public class PopupMenu extends JPopupMenu
                       }
                 });
 
-            sequenceMenu.add(menuItem);
-
-
-
+            add(menuItem);
           }
 
 
@@ -309,10 +308,7 @@ public class PopupMenu extends JPopupMenu
         {
             unGroupMenuItem.setVisible(false);
         }
-        else
-        {
-            groupMenu.insertSeparator(3);
-        }
+
 
         if (seq == null)
         {
@@ -356,7 +352,7 @@ public class PopupMenu extends JPopupMenu
 
             linkMenu.add(item);
           }
-          add(linkMenu);
+          sequenceMenu.add(linkMenu);
         }
     }
 
@@ -369,7 +365,7 @@ public class PopupMenu extends JPopupMenu
     private void jbInit() throws Exception
     {
         groupMenu.setText("Group");
-        groupMenu.setText("Group");
+        groupMenu.setText("Selection");
         groupName.setText("Name");
         groupName.addActionListener(new java.awt.event.ActionListener()
             {
@@ -481,7 +477,6 @@ public class PopupMenu extends JPopupMenu
         toggle_actionPerformed(e);
       }
     });
-    outputMenu.setText("Output to Textbox...");
     pdbMenu.setText("Associate Structure with Sequence");
     pdbFromFile.setText("From File");
     pdbFromFile.addActionListener(new ActionListener()
@@ -507,24 +502,23 @@ public class PopupMenu extends JPopupMenu
         discoverPDB_actionPerformed(e);
       }
     });
+    jMenuItem1.setText("Output to Textbox...");
     add(groupMenu);
 
-    this.add(editMenu);
-    this.add(outputMenu);
     add(sequenceMenu);
-    this.add(pdbMenu);
+    groupMenu.add(editMenu);
+    groupMenu.add(jMenuItem1);
+    groupMenu.addSeparator();
     groupMenu.add(groupName);
-        groupMenu.addSeparator();
-        groupMenu.add(unGroupMenuItem);
+    groupMenu.add(unGroupMenuItem);
         groupMenu.add(colourMenu);
-        groupMenu.addSeparator();
-        groupMenu.add(showBoxes);
+    groupMenu.add(showBoxes);
         groupMenu.add(showText);
         groupMenu.add(showColourText);
-        groupMenu.addSeparator();
-        groupMenu.add(outline);
+    groupMenu.add(outline);
         sequenceMenu.add(sequenceName);
-        colourMenu.add(noColourmenuItem);
+    sequenceMenu.add(pdbMenu);
+    colourMenu.add(noColourmenuItem);
         colourMenu.add(clustalColour);
         colourMenu.add(BLOSUM62Colour);
         colourMenu.add(PIDColour);
@@ -1151,6 +1145,7 @@ public class PopupMenu extends JPopupMenu
         }
 
         ap.av.setSelectionGroup(null);
+        ap.repaint();
         refresh();
     }