X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=237cf4c53ce7eeeb1d41c652451e1528ac2d510c;hb=c6c0cf26a5b8a7a52a5262d3887a8df79b66a687;hp=83bea2356735b8a1ac8b07607d64e76ad71d3ed7;hpb=2ac5b6423fe366e093c8f12b0935aefc9aafbe5f;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 83bea23..237cf4c 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,10 +21,14 @@ package jalview.jbgui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+import javax.swing.event.*;
 
 import jalview.schemes.*;
 import java.awt.BorderLayout;
 
+
+
+
 public class GAlignFrame
     extends JInternalFrame
 {
@@ -132,27 +136,24 @@ public class GAlignFrame
   JMenu jMenu3 = new JMenu();
   JMenuItem showAllSeqs = new JMenuItem();
   JMenuItem showAllColumns = new JMenuItem();
-  JMenu jMenu4 = new JMenu();
+  JMenu hideMenu = new JMenu();
   JMenuItem hideSelSequences = new JMenuItem();
   JMenuItem hideSelColumns = new JMenuItem();
   protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();
-  JMenu jMenu5 = new JMenu();
-
+  JMenuItem invertColSel = new JMenuItem();
+  protected JTabbedPane tabbedPane = new JTabbedPane();
   public GAlignFrame()
   {
-
-
     try
     {
       jbInit();
       setJMenuBar(alignFrameMenuBar);
 
       // dynamically fill save as menu with available formats
-      for (int i = 0; i < jalview.io.FormatAdapter.formats.size(); i++)
+      for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)
       {
-        JMenuItem item = new JMenuItem( (String) jalview.io.FormatAdapter.formats.
-                             elementAt(
-                                 i));
+        JMenuItem item = new JMenuItem( jalview.io.FormatAdapter.WRITEABLE_FORMATS[i] );
+
         item.addActionListener(new java.awt.event.ActionListener()
         {
           public void actionPerformed(ActionEvent e)
@@ -366,7 +367,7 @@ public class GAlignFrame
         deselectAllSequenceMenuItem_actionPerformed(e);
       }
     });
-    invertSequenceMenuItem.setText("Invert Selection");
+    invertSequenceMenuItem.setText("Invert Sequence Selection");
     invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1052,7 +1053,7 @@ public class GAlignFrame
         showAllColumns_actionPerformed(e);
       }
     });
-    jMenu4.setText("Hide");
+    hideMenu.setText("Hide");
     hideSelSequences.setText("Selected Sequences");
     hideSelSequences.addActionListener(new ActionListener()
     {
@@ -1078,7 +1079,30 @@ public class GAlignFrame
         hiddenMarkers_actionPerformed(e);
       }
     });
-    jMenu5.setText("Associate Structure With Sequence");
+    invertColSel.setText("Invert Column Selection");
+    invertColSel.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        invertColSel_actionPerformed(e);
+      }
+    });
+    tabbedPane.addChangeListener(new javax.swing.event.ChangeListener()
+    {
+        public void stateChanged(ChangeEvent evt)
+        {
+            JTabbedPane pane = (JTabbedPane)evt.getSource();
+            int sel = pane.getSelectedIndex();
+            tabSelectionChanged(sel);
+        }
+    });
+    tabbedPane.addMouseListener(new MouseAdapter()
+    {
+      public void mousePressed(MouseEvent e)
+      {
+        tabbedPane_mousePressed(e);
+      }
+    });
 
     alignFrameMenuBar.add(fileMenu);
     alignFrameMenuBar.add(editMenu);
@@ -1096,8 +1120,6 @@ public class GAlignFrame
     fileMenu.add(outputTextboxMenu);
     fileMenu.add(printMenuItem);
     fileMenu.addSeparator();
-    fileMenu.add(jMenu5);
-    fileMenu.addSeparator();
     fileMenu.add(exportFeatures);
     fileMenu.add(exportAnnotations);
     fileMenu.add(LoadtreeMenuItem);
@@ -1114,6 +1136,7 @@ public class GAlignFrame
     editMenu.add(selectAllSequenceMenuItem);
     editMenu.add(deselectAllSequenceMenuItem);
     editMenu.add(invertSequenceMenuItem);
+    editMenu.add(invertColSel);
     editMenu.add(deleteGroups);
     editMenu.addSeparator();
     editMenu.add(remove2LeftMenuItem);
@@ -1128,7 +1151,7 @@ public class GAlignFrame
     viewMenu.add(smoothFont);
     viewMenu.addSeparator();
     viewMenu.add(jMenu3);
-    viewMenu.add(jMenu4);
+    viewMenu.add(hideMenu);
     viewMenu.add(hiddenMarkers);
     viewMenu.addSeparator();
     viewMenu.add(wrapMenuItem);
@@ -1193,10 +1216,11 @@ public class GAlignFrame
     addSequenceMenu.add(addFromURL);
     this.getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);
     statusPanel.add(statusBar, null);
+    this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER);
     jMenu3.add(showAllColumns);
     jMenu3.add(showAllSeqs);
-    jMenu4.add(hideSelColumns);
-    jMenu4.add(hideSelSequences);
+    hideMenu.add(hideSelColumns);
+    hideMenu.add(hideSelSequences);
   }
 
   protected void outputText_actionPerformed(ActionEvent e)
@@ -1586,4 +1610,19 @@ public class GAlignFrame
   {
 
   }
+
+  public void invertColSel_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void tabSelectionChanged(int sel)
+  {
+
+  }
+
+  public void tabbedPane_mousePressed(MouseEvent e)
+  {
+
+  }
 }