after merge

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

diff --git a/src/jalview/jbgui/GTreePanel.java b/src/jalview/jbgui/GTreePanel.java
index 24e80b6..a70920c 100755 (executable)
--- a/src/jalview/jbgui/GTreePanel.java
+++ b/src/jalview/jbgui/GTreePanel.java
@@ -32,7 +32,7 @@ public class GTreePanel
   JMenuItem saveAsNewick = new JMenuItem();\r
   JMenuItem printMenu = new JMenuItem();\r
   JMenu jMenu2 = new JMenu();\r
-  public JMenuItem fontSize = new JMenuItem();\r
+  public JMenuItem font = new JMenuItem();\r
   public JCheckBoxMenuItem bootstrapMenu = new JCheckBoxMenuItem();\r
   public JCheckBoxMenuItem distanceMenu = new JCheckBoxMenuItem();\r
   public JCheckBoxMenuItem fitToWindow = new JCheckBoxMenuItem();\r
@@ -41,7 +41,6 @@ public class GTreePanel
   JMenuItem epsTree = new JMenuItem();\r
   JMenu saveAsMenu = new JMenu();\r
   JMenuItem textbox = new JMenuItem();\r
-\r
   public GTreePanel()\r
   {\r
     try\r
@@ -80,12 +79,12 @@ public class GTreePanel
       }\r
     });\r
     jMenu2.setText("View");\r
-    fontSize.setText("Font Size - 12");\r
-    fontSize.addActionListener(new java.awt.event.ActionListener()\r
+    font.setText("Font...");\r
+    font.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        fontSize_actionPerformed(e);\r
+        font_actionPerformed(e);\r
       }\r
     });\r
     bootstrapMenu.setText("Show Bootstrap Values");\r
@@ -155,7 +154,7 @@ public class GTreePanel
     jMenu1.add(textbox);\r
     jMenu1.add(printMenu);\r
     jMenu2.add(fitToWindow);\r
-    jMenu2.add(fontSize);\r
+    jMenu2.add(font);\r
     jMenu2.add(distanceMenu);\r
     jMenu2.add(bootstrapMenu);\r
     jMenu2.add(placeholdersMenu);\r
@@ -168,7 +167,7 @@ public class GTreePanel
   {\r
   }\r
 \r
-  public void fontSize_actionPerformed(ActionEvent e)\r
+  public void font_actionPerformed(ActionEvent e)\r
   {\r
   }\r
 \r
@@ -203,4 +202,9 @@ public class GTreePanel
   public void textbox_actionPerformed(ActionEvent e)\r
   {\r
   }\r
+\r
+  public void fullid_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r