X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=1b89d71c9848945444d28735db4be89efde76911;hb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;hp=b5a0d30f35e42fd34f36bd3e7dc1bd5eef31d562;hpb=02144db41ec71d19102a08d7f3b4a16b9ae7168e;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index b5a0d30..1b89d71 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) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2007 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 @@ -24,10 +24,6 @@ import javax.swing.*; import javax.swing.event.*; import jalview.schemes.*; -import java.awt.BorderLayout; - - - public class GAlignFrame extends JInternalFrame @@ -148,6 +144,7 @@ public class GAlignFrame protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem(); protected JMenuItem gatherViews = new JMenuItem(); protected JMenuItem expandViews = new JMenuItem(); + JMenuItem pageSetup = new JMenuItem(); public GAlignFrame() { try @@ -158,7 +155,8 @@ public class GAlignFrame // dynamically fill save as menu with available formats for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++) { - JMenuItem item = new JMenuItem( jalview.io.FormatAdapter.WRITEABLE_FORMATS[i] ); + JMenuItem item = new JMenuItem(jalview.io.FormatAdapter. + WRITEABLE_FORMATS[i]); item.addActionListener(new java.awt.event.ActionListener() { @@ -187,45 +185,49 @@ public class GAlignFrame reload.setMnemonic('R'); } - - if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null) + if (jalview.gui.UserDefinedColours.getUserColourSchemes() != null) { java.util.Enumeration userColours = jalview.gui.UserDefinedColours. getUserColourSchemes().keys(); while (userColours.hasMoreElements()) { - final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours. + final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem( + userColours. nextElement().toString()); radioItem.setName("USER_DEFINED"); radioItem.addMouseListener(new MouseAdapter() + { + public void mousePressed(MouseEvent evt) + { + if (evt.isControlDown() || SwingUtilities.isRightMouseButton(evt)) { - public void mousePressed(MouseEvent evt) + radioItem.removeActionListener(radioItem.getActionListeners()[0]); + + int option = JOptionPane.showInternalConfirmDialog(jalview.gui. + Desktop.desktop, + "Remove from default list?", + "Remove user defined colour", + JOptionPane.YES_NO_OPTION); + if (option == JOptionPane.YES_OPTION) + { + jalview.gui.UserDefinedColours.removeColourFromDefaults( + radioItem.getText()); + colourMenu.remove(radioItem); + } + else { - if(evt.isControlDown() || SwingUtilities.isRightMouseButton(evt)) + radioItem.addActionListener(new ActionListener() { - radioItem.removeActionListener(radioItem.getActionListeners()[0]); - - int option = JOptionPane.showInternalConfirmDialog(jalview.gui.Desktop.desktop, - "Remove from default list?", - "Remove user defined colour", - JOptionPane.YES_NO_OPTION); - if(option == JOptionPane.YES_OPTION) + public void actionPerformed(ActionEvent evt) { - jalview.gui.UserDefinedColours.removeColourFromDefaults(radioItem.getText()); - colourMenu.remove(radioItem); + userDefinedColour_actionPerformed(evt); } - else - radioItem.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent evt) - { - userDefinedColour_actionPerformed(evt); - } - }); - } + }); } - }); + } + } + }); radioItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) @@ -253,7 +255,6 @@ public class GAlignFrame setColourSelected(jalview.bin.Cache.getDefault("DEFAULT_COLOUR", "None")); - } public void setColourSelected(String defaultColour) @@ -266,8 +267,8 @@ public class GAlignFrame switch (index) { case ColourSchemeProperty.NONE: - noColourmenuItem.setSelected(true); - break; + noColourmenuItem.setSelected(true); + break; case ColourSchemeProperty.CLUSTAL: clustalColour.setSelected(true); @@ -338,7 +339,8 @@ public class GAlignFrame saveAs.setText("Save As..."); saveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event. KeyEvent.VK_S, - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()| java.awt.event.KeyEvent.SHIFT_MASK, false)); + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | + java.awt.event.KeyEvent.SHIFT_MASK, false)); saveAs.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -398,7 +400,8 @@ public class GAlignFrame }); remove2LeftMenuItem.setText("Remove Left"); remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java. - awt.event.KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); + awt.event.KeyEvent.VK_L, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); remove2LeftMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -408,7 +411,8 @@ public class GAlignFrame }); remove2RightMenuItem.setText("Remove Right"); remove2RightMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java. - awt.event.KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); + awt.event.KeyEvent.VK_R, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); remove2RightMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -431,7 +435,8 @@ public class GAlignFrame removeAllGapsMenuItem.setText("Remove All Gaps"); removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_E, - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | java.awt.event.KeyEvent.SHIFT_MASK, false)); + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | + java.awt.event.KeyEvent.SHIFT_MASK, false)); removeAllGapsMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -483,7 +488,8 @@ public class GAlignFrame }); removeRedundancyMenuItem.setText("Remove Redundancy..."); removeRedundancyMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( - java.awt.event.KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); + java.awt.event.KeyEvent.VK_D, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); removeRedundancyMenuItem.addActionListener(new java.awt.event. ActionListener() { @@ -643,7 +649,8 @@ public class GAlignFrame }); annotationPanelMenuItem.setActionCommand(""); annotationPanelMenuItem.setText("Show Annotations"); - annotationPanelMenuItem.setState( jalview.bin.Cache.getDefault("SHOW_ANNOTATIONS",true)); + annotationPanelMenuItem.setState(jalview.bin.Cache.getDefault( + "SHOW_ANNOTATIONS", true)); annotationPanelMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -722,7 +729,7 @@ public class GAlignFrame wrapMenuItem_actionPerformed(e); } }); - printMenuItem.setText("Print"); + printMenuItem.setText("Print ..."); printMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. event.KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); printMenuItem.addActionListener(new java.awt.event.ActionListener() @@ -823,7 +830,8 @@ public class GAlignFrame pasteNew.setText("To New Alignment"); pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_V, - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false)); + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | + java.awt.event.KeyEvent.SHIFT_MASK, false)); pasteNew.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -869,7 +877,7 @@ public class GAlignFrame }); seqLimits.setText("Show Sequence Limits"); - seqLimits.setState( jalview.bin.Cache.getDefault("SHOW_JVSUFFIX",true)); + seqLimits.setState(jalview.bin.Cache.getDefault("SHOW_JVSUFFIX", true)); seqLimits.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -960,7 +968,7 @@ public class GAlignFrame jMenu2.setText("Export Image"); padGapsMenuitem.setText("Pad Gaps"); - padGapsMenuitem.setState( jalview.bin.Cache.getDefault("PAD_GAPS", false)); + padGapsMenuitem.setState(jalview.bin.Cache.getDefault("PAD_GAPS", false)); padGapsMenuitem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -986,7 +994,6 @@ public class GAlignFrame } }); - featureSettings.setText("Feature Settings..."); featureSettings.addActionListener(new ActionListener() { @@ -1021,7 +1028,7 @@ public class GAlignFrame } }); autoCalculate.setText("Autocalculate Consensus"); - autoCalculate.setState( jalview.bin.Cache.getDefault("AUTO_CALC_CONSENSUS", true)); + autoCalculate.setState(jalview.bin.Cache.getDefault("AUTO_CALC_CONSENSUS", true)); autoCalculate.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1117,7 +1124,7 @@ public class GAlignFrame invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. event.KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() - |java.awt.event.KeyEvent.ALT_MASK, + | java.awt.event.KeyEvent.ALT_MASK, false)); invertColSel.addActionListener(new ActionListener() { @@ -1128,12 +1135,12 @@ public class GAlignFrame }); tabbedPane.addChangeListener(new javax.swing.event.ChangeListener() { - public void stateChanged(ChangeEvent evt) - { - JTabbedPane pane = (JTabbedPane)evt.getSource(); - int sel = pane.getSelectedIndex(); - tabSelectionChanged(sel); - } + public void stateChanged(ChangeEvent evt) + { + JTabbedPane pane = (JTabbedPane) evt.getSource(); + int sel = pane.getSelectedIndex(); + tabSelectionChanged(sel); + } }); tabbedPane.addMouseListener(new MouseAdapter() { @@ -1179,7 +1186,8 @@ public class GAlignFrame } }); tabbedPane.setToolTipText(" Right-click to rename tab" - +"
Press X to eXpand tabs, G to reGroup."); + + + "
Press X to eXpand tabs, G to reGroup."); textColour.setText("Text Colour"); textColour.addActionListener(new ActionListener() { @@ -1220,6 +1228,14 @@ public class GAlignFrame expandViews_actionPerformed(e); } }); + pageSetup.setText("Page Setup ..."); + pageSetup.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + pageSetup_actionPerformed(e); + } + }); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); @@ -1237,6 +1253,7 @@ public class GAlignFrame fileMenu.add(save); fileMenu.add(saveAs); fileMenu.add(outputTextboxMenu); + fileMenu.add(pageSetup); fileMenu.add(printMenuItem); fileMenu.addSeparator(); fileMenu.add(jMenu2); @@ -1303,8 +1320,9 @@ public class GAlignFrame calculateMenu.addSeparator(); calculateMenu.add(showTranslation); calculateMenu.add(autoCalculate); - webServiceNoServices=new JMenuItem(""); - webService.add(webServiceNoServices);pasteMenu.add(pasteNew); + webServiceNoServices = new JMenuItem(""); + webService.add(webServiceNoServices); + pasteMenu.add(pasteNew); pasteMenu.add(pasteThis); sort.add(sortIDMenuItem); sort.add(sortGroupMenuItem); @@ -1607,7 +1625,6 @@ public class GAlignFrame } - public void createEPS(java.io.File f) { } @@ -1640,8 +1657,6 @@ public class GAlignFrame { } - - protected void saveAs_actionPerformed(ActionEvent e) { } @@ -1650,7 +1665,6 @@ public class GAlignFrame { } - public void vamsasStore_actionPerformed(ActionEvent e) { @@ -1686,7 +1700,6 @@ public class GAlignFrame } - public void associatedData_actionPerformed(ActionEvent e) { @@ -1796,4 +1809,9 @@ public class GAlignFrame { } + + public void pageSetup_actionPerformed(ActionEvent e) + { + + } }