From: amwaterhouse Date: Wed, 7 Jun 2006 14:47:55 +0000 (+0000) Subject: Wrap alignment added to preferences X-Git-Tag: Release_2_1~378 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e44514b727077d5cd7edb5d8184ab85cbc2eed13;p=jalview.git Wrap alignment added to preferences --- diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index c61c799..7921ed2 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -1308,7 +1308,7 @@ public class AlignFrame * * @param e DOCUMENT ME! */ - protected void wrapMenuItem_actionPerformed(ActionEvent e) + public void wrapMenuItem_actionPerformed(ActionEvent e) { viewport.setWrapAlignment(wrapMenuItem.isSelected()); alignPanel.setWrapAlignment(wrapMenuItem.isSelected()); diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java index ba1e85e..d89d3be 100755 --- a/src/jalview/gui/CutAndPasteTransfer.java +++ b/src/jalview/gui/CutAndPasteTransfer.java @@ -166,6 +166,11 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer AlignFrame.NEW_WINDOW_HEIGHT); af.statusBar.setText("Successfully pasted alignment file"); + if(jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false)) + { + af.wrapMenuItem.setSelected(true); + af.wrapMenuItem_actionPerformed(null); + } try { af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false)); diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 09f4b3a..6ac9b76 100755 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -624,7 +624,7 @@ public class Desktop extends jalview.jbgui.GDesktop public void inputSequence_actionPerformed(ActionEvent e) { - SequenceFetcher sf = new SequenceFetcher(null); + new SequenceFetcher(null); } } diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 92f1f5b..b7905e3 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -128,6 +128,8 @@ public class Preferences extends GPreferences smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", false)); + wrap.setSelected(Cache.getDefault("WRAP_ALIGNMENT", false)); + gapSymbolCB.addItem("-"); gapSymbolCB.addItem("."); @@ -218,6 +220,8 @@ public class Preferences extends GPreferences Cache.applicationProperties.setProperty("ANTI_ALIAS", Boolean.toString(smoothFont.isSelected())); + Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", Boolean.toString(wrap.isSelected())); + Cache.applicationProperties.setProperty("STARTUP_FILE", startupFileTextfield.getText()); Cache.applicationProperties.setProperty("SHOW_STARTUP_FILE", Boolean.toString(startupCheckbox.isSelected())); diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index 19ee273..79d55fd 100755 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -552,7 +552,7 @@ public class SeqPanel extends JPanel implements MouseListener, sbuffer.append("disulfide bond " + features[i].getBegin() + ":" + features[i].getEnd()); if (features[i].links != null) - sbuffer.append(""); + sbuffer.append(" "); } } else @@ -574,7 +574,7 @@ public class SeqPanel extends JPanel implements MouseListener, sbuffer.append("; (" + features[i].getStatus() + ")"); } if (features[i].links != null) - sbuffer.append(""); + sbuffer.append(" "); } } diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java index 7b25531..6bdba4a 100755 --- a/src/jalview/gui/SequenceFetcher.java +++ b/src/jalview/gui/SequenceFetcher.java @@ -373,6 +373,12 @@ public class SequenceFetcher AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT); af.statusBar.setText("Successfully pasted alignment file"); + if (jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false)) + { + af.wrapMenuItem.setSelected(true); + af.wrapMenuItem_actionPerformed(null); + } + try { af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false)); diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 3aaba9e..f720804 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -164,6 +164,11 @@ public class FileLoader Desktop.addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT); + if(jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false)) + { + af.wrapMenuItem.setSelected(true); + af.wrapMenuItem_actionPerformed(null); + } try { af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false)); diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 3ca4c79..8c1eea1 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -24,7 +24,8 @@ import javax.swing.*; import javax.swing.border.TitledBorder; import java.awt.event.*; import javax.swing.event.*; - +import java.awt.Font; +import java.awt.Rectangle; /** * DOCUMENT ME! @@ -110,6 +111,7 @@ public class GPreferences extends JPanel protected JCheckBox modellerOutput = new JCheckBox(); protected JPanel dasPanel = new JPanel(); BorderLayout borderLayout4 = new BorderLayout(); + protected JCheckBox wrap = new JCheckBox(); /** * Creates a new GPreferences object. */ @@ -191,7 +193,7 @@ public class GPreferences extends JPanel gapLabel.setHorizontalAlignment(SwingConstants.RIGHT); gapLabel.setText("Gap Symbol "); colour.setFont(verdana11); - colour.setBounds(new Rectangle(171, 180, 155, 21)); + colour.setBounds(new Rectangle(172, 188, 155, 21)); colourLabel.setFont(verdana11); colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); colourLabel.setText("Colour "); @@ -199,13 +201,13 @@ public class GPreferences extends JPanel fontLabel.setHorizontalAlignment(SwingConstants.RIGHT); fontLabel.setText("Font "); fontSizeCB.setFont(verdana11); - fontSizeCB.setBounds(new Rectangle(318, 100, 49, 21)); + fontSizeCB.setBounds(new Rectangle(317, 92, 49, 21)); fontStyleCB.setFont(verdana11); - fontStyleCB.setBounds(new Rectangle(366, 100, 70, 21)); + fontStyleCB.setBounds(new Rectangle(364, 92, 70, 21)); fontNameCB.setFont(verdana11); - fontNameCB.setBounds(new Rectangle(171, 100, 147, 21)); + fontNameCB.setBounds(new Rectangle(171, 92, 147, 21)); gapSymbolCB.setFont(verdana11); - gapSymbolCB.setBounds(new Rectangle(171, 153, 69, 21)); + gapSymbolCB.setBounds(new Rectangle(172, 163, 69, 21)); startupCheckbox.setText("Open file"); startupCheckbox.setFont(verdana11); startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT); @@ -310,14 +312,14 @@ public class GPreferences extends JPanel jPanel1.setBorder(titledBorder1); jPanel1.setLayout(gridBagLayout1); sortby.setFont(verdana11); - sortby.setBounds(new Rectangle(171, 208, 155, 21)); + sortby.setBounds(new Rectangle(171, 213, 155, 21)); sortLabel.setFont(verdana11); sortLabel.setHorizontalAlignment(SwingConstants.RIGHT); sortLabel.setText("Sort by "); jPanel2.setBounds(new Rectangle(7, 17, 158, 245)); jPanel2.setLayout(gridLayout2); - gridLayout2.setRows(9); - jPanel3.setBounds(new Rectangle(167, 41, 274, 26)); + gridLayout2.setRows(10); + jPanel3.setBounds(new Rectangle(169, 39, 274, 26)); exportTab.setLayout(null); epsLabel.setFont(verdana11); epsLabel.setHorizontalAlignment(SwingConstants.RIGHT); @@ -374,24 +376,29 @@ public class GPreferences extends JPanel modellerOutput.setText("Use Modeller Output"); modellerOutput.setBounds(new Rectangle(228, 226, 168, 23)); dasPanel.setLayout(borderLayout4); + wrap.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + wrap.setHorizontalAlignment(SwingConstants.TRAILING); + wrap.setHorizontalTextPosition(SwingConstants.LEADING); + wrap.setText("Wrap Alignment"); jPanel2.add(fullScreen); jPanel2.add(annotations); jPanel2.add(seqLimit); jPanel2.add(fontLabel); jPanel2.add(smoothFont); + jPanel2.add(wrap); jPanel2.add(gapLabel); jPanel2.add(colourLabel); jPanel2.add(sortLabel); jPanel2.add(startupCheckbox); - visualTab.add(colour); - visualTab.add(gapSymbolCB); - visualTab.add(startupFileTextfield); visualTab.add(sortby); + visualTab.add(gapSymbolCB); + visualTab.add(colour); visualTab.add(fontNameCB); visualTab.add(fontSizeCB); visualTab.add(fontStyleCB); visualTab.add(jPanel3); + visualTab.add(startupFileTextfield); jPanel3.add(conservation); jPanel3.add(identity); jPanel3.add(quality);