X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=9b9a44a68a7c0ad2eada4eaf2e1882abbe5fd4f5;hb=c8d80485038ab96fb06bd0885c323803646d8e57;hp=46271978a67f6ebb3417115c567d689495d2650a;hpb=1b1f995b3eb83dc3496510bfc2278f1f72fcfd8a;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 4627197..9b9a44a 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -104,6 +104,8 @@ public class GAlignFrame extends JInternalFrame
 
   JMenuItem copy = new JMenuItem();
 
+  JMenuItem copyHighlighted = new JMenuItem();
+
   JMenuItem cut = new JMenuItem();
 
   JMenu pasteMenu = new JMenu();
@@ -218,6 +220,7 @@ public class GAlignFrame extends JInternalFrame
   {
     try
     {
+      setFrameIcon(null);
 
       // for Web-page embedding using id=align-frame-div
       setName("jalview-alignment");
@@ -243,7 +246,7 @@ public class GAlignFrame extends JInternalFrame
       }
     } catch (Exception e)
     {
-      System.err.println(e.toString());
+      jalview.bin.Console.errPrintln(e.toString());
     }
 
     if (Platform.allowMnemonics()) // was "not mac and not JS"
@@ -261,6 +264,7 @@ public class GAlignFrame extends JInternalFrame
 
   private void jbInit() throws Exception
   {
+    setFrameIcon(null);
     initColourMenu();
 
     JMenuItem saveAs = new JMenuItem(
@@ -1083,7 +1087,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        createPNG(null);
+        createPNG_actionPerformed(e);
       }
     });
     createPNG.setActionCommand(
@@ -1115,7 +1119,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        createEPS(null);
+        createEPS_actionPerformed(e);
       }
     });
 
@@ -1125,7 +1129,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        createSVG(null);
+        createSVG_actionPerformed(e);
       }
     });
 
@@ -1761,6 +1765,26 @@ public class GAlignFrame extends JInternalFrame
       }
     };
     selectHighlighted.addActionListener(al);
+
+    copyHighlighted = new JMenuItem(
+            MessageManager.getString("action.copy_highlighted_regions"));
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C,
+            jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx()
+                    + jalview.util.ShortcutKeyMaskExWrapper.SHIFT_DOWN_MASK,
+            false);
+    copyHighlighted.setToolTipText(
+            MessageManager.getString("tooltip.copy_highlighted_regions"));
+    al = new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        copyHighlightedColumns_actionPerformed(actionEvent);
+      }
+    };
+    addMenuActionAndAccelerator(keyStroke, copyHighlighted, al);
+    copyHighlighted.addActionListener(al);
+
     JMenu tooltipSettingsMenu = new JMenu(
             MessageManager.getString("label.sequence_id_tooltip"));
     JMenu autoAnnMenu = new JMenu(
@@ -1811,6 +1835,7 @@ public class GAlignFrame extends JInternalFrame
     editMenu.add(redoMenuItem);
     editMenu.add(cut);
     editMenu.add(copy);
+    editMenu.add(copyHighlighted);
     editMenu.add(pasteMenu);
     editMenu.add(delete);
     editMenu.addSeparator();
@@ -1956,6 +1981,30 @@ public class GAlignFrame extends JInternalFrame
     // selectMenu.add(listenToViewSelections);
   }
 
+  protected void createPNG_actionPerformed(ActionEvent object)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  protected void createEPS_actionPerformed(ActionEvent object)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  protected void createSVG_actionPerformed(ActionEvent object)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  protected void copyHighlightedColumns_actionPerformed(
+          ActionEvent actionEvent)
+  {
+
+  }
+
   protected void loadVcf_actionPerformed()
   {
   }
@@ -2133,7 +2182,7 @@ public class GAlignFrame extends JInternalFrame
    * @param forAlignment
    *          update non-sequence-related annotations
    */
-  protected void setAnnotationsVisibility(boolean visible,
+  public void setAnnotationsVisibility(boolean visible,
           boolean forSequences, boolean forAlignment)
   {
 
@@ -2443,10 +2492,6 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  public void createPNG(java.io.File f)
-  {
-  }
-
   protected void font_actionPerformed(ActionEvent e)
   {
   }
@@ -2460,15 +2505,6 @@ public class GAlignFrame extends JInternalFrame
 
   }
 
-  public void createEPS(java.io.File f)
-  {
-  }
-
-  public void createSVG(java.io.File f)
-  {
-
-  }
-
   protected void loadTreeMenuItem_actionPerformed(ActionEvent e)
   {