view full id name optional

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 9d7e2b7..f4139c6 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -33,7 +33,7 @@ public class AlignFrame extends GAlignFrame
   public AlignFrame(AlignmentI al)\r
   {\r
     super();\r
-    viewport = new AlignViewport(al,true,true,true,false);\r
+    viewport = new AlignViewport(al,true,true,false);\r
 \r
     String fontName = jalview.bin.Cache.getProperty("FONT_NAME");\r
     String fontStyle= jalview.bin.Cache.getProperty("FONT_STYLE");\r
@@ -533,6 +533,14 @@ public class AlignFrame extends GAlignFrame
     Desktop.addInternalFrame(frame, "Change Font", 480,100);\r
   }\r
 \r
+  protected void fullSeqId_actionPerformed(ActionEvent e)\r
+  {\r
+    viewport.setShowFullId( fullSeqId.isSelected() );\r
+\r
+    alignPanel.idPanel.idCanvas.setPreferredSize( alignPanel.calculateIdWidth() );\r
+    alignPanel.RefreshPanels();\r
+  }\r
+\r
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)\r
   {\r
       viewport.setColourText( colourTextMenuItem.isSelected() );\r

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 2f40de4..0c9be38 100755 (executable)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -15,7 +15,7 @@ public class AlignViewport
   int startSeq;\r
   int endSeq;\r
 \r
-  boolean showScores=false;\r
+  boolean showFullId = false;\r
   boolean showText=true;\r
   boolean showColourText=false;\r
   boolean showBoxes=true;\r
@@ -51,11 +51,10 @@ public class AlignViewport
 \r
 \r
   public AlignViewport(AlignmentI da,\r
-                       boolean showScores,\r
                        boolean showText,\r
                        boolean showBoxes,\r
                        boolean wrapAlignment) {\r
-    this(0,da.getWidth()-1,0,da.getHeight()-1,showScores,\r
+    this(0,da.getWidth()-1,0,da.getHeight()-1,\r
          showText,\r
          showBoxes,\r
          wrapAlignment);\r
@@ -65,7 +64,6 @@ public class AlignViewport
 \r
   public AlignViewport(int startRes, int endRes,\r
                        int startSeq, int endSeq,\r
-                       boolean showScores,\r
                        boolean showText,\r
                        boolean showBoxes,\r
                        boolean wrapAlignment) {\r
@@ -74,14 +72,10 @@ public class AlignViewport
     this.endRes   = endRes;\r
     this.startSeq = startSeq;\r
     this.endSeq   = endSeq;\r
-\r
-    this.showScores    = showScores;\r
     this.showText      = showText;\r
     this.showBoxes     = showBoxes;\r
     this.wrapAlignment = wrapAlignment;\r
 \r
-   // og  = new AlignmentOutputGenerator(this);\r
-\r
     setFont( font );\r
  }\r
 \r
@@ -240,9 +234,7 @@ public class AlignViewport
   public void setAlignment(AlignmentI align) {\r
     this.alignment = align;\r
   }\r
-  public void setShowScores(boolean state) {\r
-    showScores = state;\r
-  }\r
+\r
   public void setWrapAlignment(boolean state) {\r
     wrapAlignment = state;\r
   }\r
@@ -273,9 +265,7 @@ public class AlignViewport
   public void setShowBoxes(boolean state) {\r
     showBoxes = state;\r
   }\r
-  public boolean getShowScores() {\r
-    return showScores;\r
-  }\r
+\r
   public boolean getWrapAlignment() {\r
       return wrapAlignment;\r
   }\r
@@ -355,5 +345,13 @@ public class AlignViewport
   public boolean getColourAppliesToAllGroups()\r
   {return colourAppliesToAllGroups; }\r
 \r
+  public boolean getShowFullId()\r
+  {\r
+    return showFullId;\r
+  }\r
 \r
+  public void setShowFullId(boolean b)\r
+  {\r
+    showFullId = b;\r
+  }\r
 }\r