X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=f7b1342f51abaf9967405358384606d7a0e769fc;hb=7b5010ef9c87b8af5e4e51aba5fba47c5aa43c9a;hp=6ec19e26b75493d5b659b9ea3e905c2805cb2c0d;hpb=4e988b599b29712e28b5746d7594c33c67cd2f74;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 6ec19e2..f7b1342 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -115,9 +115,10 @@ public class GAlignFrame protected ButtonGroup colours = new ButtonGroup(); JMenuItem vamsasStore = new JMenuItem(); protected JCheckBoxMenuItem showTranslation = new JCheckBoxMenuItem(); - protected JTabbedPane tabbedPane = new JTabbedPane(); - protected JMenuItem featureSettings = new JMenuItem(); + //protected JTabbedPane tabbedPane = new JTabbedPane(); + public JMenuItem featureSettings = new JMenuItem(); public JCheckBoxMenuItem seqDBRef = new JCheckBoxMenuItem(); + JMenuItem fetchSequence = new JMenuItem(); public GAlignFrame() { @@ -476,21 +477,6 @@ public class GAlignFrame }); this.getContentPane().setLayout(borderLayout1); alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11)); - alignFrameMenuBar.addAncestorListener(new AncestorListener() - { - public void ancestorAdded(AncestorEvent event) - { - alignFrameMenuBar_ancestorAdded(event); - } - - public void ancestorRemoved(AncestorEvent event) - { - } - - public void ancestorMoved(AncestorEvent event) - { - } - }); statusBar.setBackground(Color.white); statusBar.setFont(new java.awt.Font("Verdana", 0, 11)); statusBar.setBorder(BorderFactory.createLineBorder(Color.black)); @@ -912,6 +898,7 @@ public class GAlignFrame padGapsMenuitem_actionPerformed(e); } }); + vamsasStore.setVisible(false); vamsasStore.setText("VAMSAS store"); vamsasStore.addActionListener(new ActionListener() { @@ -929,14 +916,14 @@ public class GAlignFrame } }); - tabbedPane.addChangeListener(new ChangeListener() + /* tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent ece) { tabSelected(); } - }); + });*/ featureSettings.setEnabled(false); featureSettings.setText("Feature Settings..."); featureSettings.addActionListener(new ActionListener() @@ -947,7 +934,7 @@ public class GAlignFrame } }); seqDBRef.setState( jalview.bin.Cache.getDefault("SHOW_DBPREFIX",true)); - seqDBRef.setText("Show Sequence DB Refs"); + seqDBRef.setText("Show Full Sequence Id"); seqDBRef.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -955,6 +942,14 @@ public class GAlignFrame seqDBRef_actionPerformed(e); } }); + fetchSequence.setText("Fetch Sequence..."); + fetchSequence.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + fetchSequence_actionPerformed(e); + } + }); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); alignFrameMenuBar.add(searchMenu); @@ -962,6 +957,7 @@ public class GAlignFrame alignFrameMenuBar.add(colourMenu); alignFrameMenuBar.add(calculateMenu); alignFrameMenuBar.add(webService); + fileMenu.add(fetchSequence); fileMenu.add(vamsasStore); fileMenu.add(saveAlignmentMenu); fileMenu.add(jMenu2); @@ -1039,7 +1035,7 @@ public class GAlignFrame webServiceNoServices=new JMenuItem(""); webService.add(webServiceNoServices); this.getContentPane().add(statusBar, BorderLayout.SOUTH); - this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER); + // this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER); jMenu1.add(pasteNew); jMenu1.add(pasteThis); sort.add(sortIDMenuItem); @@ -1166,10 +1162,6 @@ public class GAlignFrame { } - protected void clustalAlignMenuItem_actionPerformed(ActionEvent e) - { - } - protected void clustalColour_actionPerformed(ActionEvent e) { } @@ -1324,17 +1316,7 @@ public class GAlignFrame { } - protected void preferences_actionPerformed(ActionEvent e) - { - } - protected void msaAlignMenuItem_actionPerformed(ActionEvent e) - { - } - - protected void alignFrameMenuBar_ancestorAdded(AncestorEvent event) - { - } protected void saveAlignmentMenu_actionPerformed(ActionEvent e) { @@ -1344,9 +1326,6 @@ public class GAlignFrame { } - protected void ClustalRealign_actionPerformed(ActionEvent e) - { - } public void vamsasStore_actionPerformed(ActionEvent e) { @@ -1373,4 +1352,8 @@ public class GAlignFrame } + public void fetchSequence_actionPerformed(ActionEvent e) + { + + } }