Doesnt move with mouse, friendlier for mac users

[jalview.git] / src / jalview / appletgui / APopupMenu.java

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index 5e48190..0d4e3e1 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -32,6 +32,7 @@ public class APopupMenu
     extends java.awt.PopupMenu implements ActionListener, ItemListener\r
 {\r
   Menu groupMenu = new Menu();\r
+  MenuItem editGroupName = new MenuItem();\r
   protected MenuItem clustalColour = new MenuItem();\r
   protected MenuItem zappoColour = new MenuItem();\r
   protected MenuItem taylorColour = new MenuItem();\r
@@ -71,10 +72,6 @@ public class APopupMenu
   MenuItem revealAll = new MenuItem();\r
   Menu menu1 = new Menu();\r
 \r
-  Dialog editNameDialog;\r
-  Button okDialog = new Button("Accept");\r
-  Button cancelDialog = new Button("Cancel");\r
-\r
   public APopupMenu(AlignmentPanel apanel, final Sequence seq, Vector links)\r
   {\r
     ///////////////////////////////////////////////////////////\r
@@ -108,6 +105,7 @@ public class APopupMenu
 \r
     if (sg != null && sg.getSize()>0)\r
     {\r
+      editGroupName.setLabel(sg.getName());\r
       showText.setState(sg.getDisplayText());\r
       showColourText.setState(sg.getColourText());\r
       showBoxes.setState(sg.getDisplayBoxes());\r
@@ -225,12 +223,6 @@ public class APopupMenu
 \r
     else if(source == sequenceName)\r
       editName();\r
-    else if (source==okDialog || source==cancelDialog)\r
-    {\r
-      editNameDialog.setVisible(false);\r
-      if(source==cancelDialog)\r
-        editNameDialog = null;\r
-    }\r
     else if(source == pdb)\r
       addPDB();\r
     else if(source == hideSeqs)\r
@@ -242,6 +234,24 @@ public class APopupMenu
         ap.av.showAllHiddenSeqs();\r
     }\r
 \r
+    else if(source==editGroupName)\r
+    {\r
+      EditNameDialog dialog = new EditNameDialog(\r
+          getGroup().getName(),\r
+          getGroup().getDescription(),\r
+          "       Group Name",\r
+          "Group Description",\r
+          ap,\r
+          "Edit Group Name / Description");\r
+\r
+      if (dialog.accept)\r
+      {\r
+\r
+        getGroup().setName(dialog.getName().replace(' ', '_'));\r
+        getGroup().setDescription(dialog.getDescription());\r
+      }\r
+\r
+    }\r
     else if(source==copy)\r
       ap.alignFrame.copy_actionPerformed();\r
     else if(source==cut)\r
@@ -342,43 +352,18 @@ public class APopupMenu
 \r
   void editName()\r
   {\r
-    TextField id = new TextField(seq.getName(), 40);\r
-    TextField description = new TextField(seq.getDescription(), 40);\r
-    Panel panel = new Panel(new BorderLayout());\r
-    Panel panel2 = new Panel(new BorderLayout());\r
-    panel2.add(new Label("       Sequence Name "), BorderLayout.WEST);\r
-    panel2.add(id, BorderLayout.CENTER);\r
-    panel.add(panel2, BorderLayout.NORTH);\r
-    panel2 = new Panel(new BorderLayout());\r
-    panel2.add(new Label("Sequence Description "), BorderLayout.WEST);\r
-    panel2.add(description, BorderLayout.CENTER);\r
-    panel.add(panel2, BorderLayout.CENTER);\r
-\r
-    panel2 = new Panel(new FlowLayout());\r
-\r
-    panel2.add(okDialog);\r
-    panel2.add(cancelDialog);\r
-\r
-    panel.add(panel2, BorderLayout.SOUTH);\r
-\r
-    editNameDialog = new Dialog(ap.alignFrame,\r
-      "Edit Sequence Name / Description",\r
-      true);\r
-\r
-    editNameDialog.add(panel, BorderLayout.NORTH);\r
-\r
-    editNameDialog.setBounds(ap.alignFrame.getBounds().x\r
-                             +(ap.alignFrame.getSize().width-500)/2 ,\r
-                             ap.alignFrame.getBounds().y\r
-                             +(ap.alignFrame.getSize().height-120)/2,\r
-                             500, 130);\r
-\r
-    editNameDialog.show();\r
-\r
-    if (editNameDialog != null)\r
+    EditNameDialog dialog = new EditNameDialog(\r
+        seq.getName(),\r
+        seq.getDescription(),\r
+        "       Sequence Name ",\r
+        "Sequence Description ",\r
+        ap,\r
+        "Edit Sequence Name / Description");\r
+\r
+    if (dialog.accept)\r
     {\r
-      seq.setName(id.getText());\r
-      seq.setDescription(description.getText());\r
+      seq.setName(dialog.getName());\r
+      seq.setDescription(dialog.getDescription());\r
       ap.repaint();\r
     }\r
   }\r
@@ -399,6 +384,7 @@ public class APopupMenu
     groupMenu.setLabel("Group");\r
     groupMenu.setLabel("Selection");\r
 \r
+    editGroupName.addActionListener(this);\r
     unGroupMenuItem.setLabel("Remove Group");\r
     unGroupMenuItem.addActionListener(this);\r
 \r
@@ -427,6 +413,7 @@ public class APopupMenu
     this.add(seqMenu);\r
     this.add(hideSeqs);\r
     this.add(revealAll);\r
+    groupMenu.add(editGroupName);\r
     groupMenu.add(editMenu);\r
     groupMenu.add(outputmenu);\r
     groupMenu.add(menu1);\r
@@ -498,9 +485,6 @@ public class APopupMenu
     hideSeqs.addActionListener(this);\r
     repGroup.addActionListener(this);\r
     revealAll.addActionListener(this);\r
-    okDialog.addActionListener(this);\r
-    cancelDialog.addActionListener(this);\r
-\r
   }\r
 \r
   void refresh()\r