X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=d7c2b43633ee9e635b7f8d62b8f85041ce42548d;hb=a8d30fa38a5d3e9cccf08aa446ca8ab00469bfd4;hp=5620a3e1739e5905fc34c8012157000e3633c39e;hpb=198a4921d78d176afc0cb709bdbcb4627afd1e8b;p=jalview.git

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 5620a3e..d7c2b43 100755
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -97,6 +97,12 @@ public class AlignFrame
           wrapMenuItem_actionPerformed();
         }
       }
+      param = applet.getParameter("centrecolumnlabels");
+      if (param != null)
+      {
+        centreColumnLabelFlag.setState(true);
+        centreColumnLabelFlag_stateChanged();
+      }
 
       try
       {
@@ -545,11 +551,20 @@ public class AlignFrame
     else if (evt.getSource() == autoCalculate)
     {
       viewport.autocalculateConsensus = autoCalculate.getState();
+    } else if (evt.getSource() == this.centreColumnLabelFlag)
+    {
+      centreColumnLabelFlag_stateChanged();
     }
-
+    
     alignPanel.paintAlignment(true);
   }
 
+  private void centreColumnLabelFlag_stateChanged()
+  {
+    viewport.centreColumnLabels = centreColumnLabelFlag.getState();
+    this.alignPanel.annotationPanel.repaint();
+  }
+
   public void actionPerformed(ActionEvent evt)
   {
     Object source = evt.getSource();
@@ -1022,7 +1037,16 @@ public class AlignFrame
     try
     {
       new URL(url);
+      url = URLEncoder.encode(url);
     }
+    /* When we finally deprecate 1.1 compatibility, 
+     * we can start to use URLEncoder.encode(url,"UTF-8") 
+     * and then we'll need this catch:
+     * catch (UnsupportedEncodingException ex)
+    {
+      System.err.println("WARNING - IMPLEMENTATION ERROR - UNSUPPORTED ENCODING EXCEPTION FOR "+url);
+      ex.printStackTrace();
+    } */
     catch (java.net.MalformedURLException ex)
     {
       url = viewport.applet.getCodeBase() + url;
@@ -2465,6 +2489,7 @@ public class AlignFrame
   MenuItem documentation = new MenuItem();
   MenuItem about = new MenuItem();
    CheckboxMenuItem seqLimits = new CheckboxMenuItem();
+   CheckboxMenuItem centreColumnLabelFlag = new CheckboxMenuItem();
 
   private void jbInit()
       throws Exception
@@ -2632,7 +2657,9 @@ public class AlignFrame
     autoCalculate.addItemListener(this);
     inputText.setLabel("Input from textbox");
     inputText.addActionListener(this);
-
+    centreColumnLabelFlag.setLabel("Centre column labels");
+    centreColumnLabelFlag.addItemListener(this);
+    
     helpMenu.setLabel("Help");
     documentation.setLabel("Documentation");
     documentation.addActionListener(this);
@@ -2771,6 +2798,7 @@ public class AlignFrame
     formatMenu.add(viewTextMenuItem);
     formatMenu.add(colourTextMenuItem);
     formatMenu.add(renderGapsMenuItem);
+    formatMenu.add(centreColumnLabelFlag);
     selectMenu.add(findMenuItem);
     selectMenu.addSeparator();
     selectMenu.add(selectAllSequenceMenuItem);