X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=237cf4c53ce7eeeb1d41c652451e1528ac2d510c;hb=7749f0e593d610c517dfd6796cf6087191b189ad;hp=4f9a7132b737e0117bd801121b27541aaf019f95;hpb=083f7cdc8b059e5057245f161fcaab4d5bb9fa7d;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 4f9a713..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
 {
@@ -114,7 +118,7 @@ public class GAlignFrame
   protected JCheckBoxMenuItem padGapsMenuitem = new JCheckBoxMenuItem();
   protected ButtonGroup colours = new ButtonGroup();
   JMenuItem vamsasStore = new JMenuItem();
-  protected JCheckBoxMenuItem showTranslation = new JCheckBoxMenuItem();
+  protected JMenuItem showTranslation = new JMenuItem();
   public JMenuItem featureSettings = new JMenuItem();
   JMenuItem fetchSequence = new JMenuItem();
   protected JCheckBoxMenuItem smoothFont = new JCheckBoxMenuItem();
@@ -127,27 +131,29 @@ public class GAlignFrame
   JMenuItem addFromURL = new JMenuItem();
   JMenuItem exportAnnotations = new JMenuItem();
   JMenuItem exportFeatures = new JMenuItem();
-  JMenuItem dbRefs = new JMenuItem();
   protected JPanel statusPanel = new JPanel();
   GridLayout gridLayout1 = new GridLayout();
   JMenu jMenu3 = new JMenu();
-  JMenuItem defaultDASSource = new JMenuItem();
-  JMenuItem modifyDASSource = new JMenuItem();
+  JMenuItem showAllSeqs = new JMenuItem();
+  JMenuItem showAllColumns = new JMenuItem();
+  JMenu hideMenu = new JMenu();
+  JMenuItem hideSelSequences = new JMenuItem();
+  JMenuItem hideSelColumns = new JMenuItem();
+  protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();
+  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)
@@ -361,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)
@@ -1029,32 +1035,75 @@ public class GAlignFrame
         exportAnnotations_actionPerformed(e);
       }
     });
-    dbRefs.setText("Fetch DB Refs");
-    dbRefs.addActionListener(new ActionListener()
+    statusPanel.setLayout(gridLayout1);
+    jMenu3.setText("Show");
+    showAllSeqs.setText("All Sequences");
+    showAllSeqs.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        dbRefs_actionPerformed(e);
+        showAllSeqs_actionPerformed(e);
       }
     });
-    statusPanel.setLayout(gridLayout1);
-    jMenu3.setText("Fetch Sequence Features");
-    defaultDASSource.setText("Use Default DAS Source");
-    defaultDASSource.addActionListener(new ActionListener()
+    showAllColumns.setText("All Columns");
+    showAllColumns.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        showAllColumns_actionPerformed(e);
+      }
+    });
+    hideMenu.setText("Hide");
+    hideSelSequences.setText("Selected Sequences");
+    hideSelSequences.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        hideSelSequences_actionPerformed(e);
+      }
+    });
+    hideSelColumns.setText("Selected Columns");
+    hideSelColumns.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        hideSelColumns_actionPerformed(e);
+      }
+    });
+    hiddenMarkers.setText("Hidden Markers");
+    hiddenMarkers.setState(true);
+    hiddenMarkers.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        defaultDASSource_actionPerformed(e);
+        hiddenMarkers_actionPerformed(e);
       }
     });
-    modifyDASSource.setText("Modify DAS Source...");
-    modifyDASSource.addActionListener(new ActionListener()
+    invertColSel.setText("Invert Column Selection");
+    invertColSel.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        modifyDASSource_actionPerformed(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);
     alignFrameMenuBar.add(searchMenu);
@@ -1087,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);
@@ -1100,6 +1150,10 @@ public class GAlignFrame
     viewMenu.add(font);
     viewMenu.add(smoothFont);
     viewMenu.addSeparator();
+    viewMenu.add(jMenu3);
+    viewMenu.add(hideMenu);
+    viewMenu.add(hiddenMarkers);
+    viewMenu.addSeparator();
     viewMenu.add(wrapMenuItem);
     viewMenu.add(seqLimits);
     viewMenu.add(scaleAbove);
@@ -1111,8 +1165,6 @@ public class GAlignFrame
     viewMenu.add(renderGapsMenuItem);
     viewMenu.add(annotationPanelMenuItem);
     viewMenu.addSeparator();
-    viewMenu.add(dbRefs);
-    viewMenu.add(jMenu3);
     viewMenu.add(showSeqFeatures);
     viewMenu.add(featureSettings);
     viewMenu.addSeparator();
@@ -1164,8 +1216,11 @@ public class GAlignFrame
     addSequenceMenu.add(addFromURL);
     this.getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);
     statusPanel.add(statusBar, null);
-    jMenu3.add(defaultDASSource);
-    jMenu3.add(modifyDASSource);
+    this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER);
+    jMenu3.add(showAllColumns);
+    jMenu3.add(showAllSeqs);
+    hideMenu.add(hideSelColumns);
+    hideMenu.add(hideSelSequences);
   }
 
   protected void outputText_actionPerformed(ActionEvent e)
@@ -1516,20 +1571,58 @@ public class GAlignFrame
 
   }
 
-  public void dbRefs_actionPerformed(ActionEvent e)
+  public void showAllSeqs_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void showAllColumns_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void hideSelSequences_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void hideSelColumns_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void hiddenMarkers_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void findPdbId_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void enterPdbId_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void pdbFile_actionPerformed(ActionEvent e)
   {
 
   }
 
-  public void defaultDASSource_actionPerformed(ActionEvent e)
+  public void invertColSel_actionPerformed(ActionEvent e)
   {
 
   }
 
-  public void modifyDASSource_actionPerformed(ActionEvent e)
+  public void tabSelectionChanged(int sel)
   {
 
   }
 
+  public void tabbedPane_mousePressed(MouseEvent e)
+  {
 
+  }
 }