X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=2b194bf36078d4155f5b2a8e6992328acf6284c2;hb=5dd663636925f44c6f964fa32fed2f584223b295;hp=2001efd9fa775de198c783878568b511f4ba8781;hpb=55e2e9b22b133db8b9ff0979b0338a33081fc8fd;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 2001efd..2b194bf 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.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 @@ -24,7 +24,9 @@ import javax.swing.*; import javax.swing.border.TitledBorder; import java.awt.event.*; import javax.swing.event.*; - +import java.awt.Font; +import java.awt.Rectangle; +import java.awt.Insets; /** * DOCUMENT ME! @@ -103,6 +105,16 @@ public class GPreferences extends JPanel Font verdana11 = new java.awt.Font("Verdana", Font.PLAIN, 11); protected JCheckBox seqLimit = new JCheckBox(); GridLayout gridLayout3 = new GridLayout(); + protected JCheckBox smoothFont = new JCheckBox(); + JPanel calcTab = new JPanel(); + protected JCheckBox autoCalculateConsCheck = new JCheckBox(); + protected JCheckBox padGaps = new JCheckBox(); + protected JCheckBox modellerOutput = new JCheckBox(); + protected JPanel dasPanel = new JPanel(); + BorderLayout borderLayout4 = new BorderLayout(); + protected JCheckBox wrap = new JCheckBox(); + protected JCheckBox rightAlign = new JCheckBox(); + protected JCheckBox idItalics = new JCheckBox(); /** * Creates a new GPreferences object. */ @@ -153,7 +165,6 @@ public class GPreferences extends JPanel fullScreen.setFont(verdana11); fullScreen.setHorizontalAlignment(SwingConstants.RIGHT); fullScreen.setHorizontalTextPosition(SwingConstants.LEFT); - fullScreen.setMargin(new Insets(2, 2, 2, 0)); fullScreen.setText("Maximise Window"); conservation.setEnabled(false); conservation.setFont(verdana11); @@ -170,7 +181,6 @@ public class GPreferences extends JPanel annotations.setFont(verdana11); annotations.setHorizontalAlignment(SwingConstants.RIGHT); annotations.setHorizontalTextPosition(SwingConstants.LEFT); - annotations.setMargin(new Insets(2, 4, 2, 0)); annotations.setSelected(true); annotations.setText("Show Annotations"); annotations.addActionListener(new ActionListener() @@ -184,7 +194,7 @@ public class GPreferences extends JPanel gapLabel.setHorizontalAlignment(SwingConstants.RIGHT); gapLabel.setText("Gap Symbol "); colour.setFont(verdana11); - colour.setBounds(new Rectangle(170, 170, 155, 21)); + colour.setBounds(new Rectangle(172, 225, 155, 21)); colourLabel.setFont(verdana11); colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); colourLabel.setText("Colour "); @@ -192,20 +202,20 @@ public class GPreferences extends JPanel fontLabel.setHorizontalAlignment(SwingConstants.RIGHT); fontLabel.setText("Font "); fontSizeCB.setFont(verdana11); - fontSizeCB.setBounds(new Rectangle(317, 111, 49, 21)); + fontSizeCB.setBounds(new Rectangle(319, 111, 49, 21)); fontStyleCB.setFont(verdana11); - fontStyleCB.setBounds(new Rectangle(365, 111, 70, 21)); + fontStyleCB.setBounds(new Rectangle(367, 111, 70, 21)); fontNameCB.setFont(verdana11); - fontNameCB.setBounds(new Rectangle(170, 111, 147, 21)); + fontNameCB.setBounds(new Rectangle(172, 111, 147, 21)); gapSymbolCB.setFont(verdana11); - gapSymbolCB.setBounds(new Rectangle(170, 141, 69, 21)); + gapSymbolCB.setBounds(new Rectangle(172, 204, 69, 21)); startupCheckbox.setText("Open file"); startupCheckbox.setFont(verdana11); startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT); startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT); startupCheckbox.setSelected(true); startupFileTextfield.setFont(verdana11); - startupFileTextfield.setBounds(new Rectangle(170, 232, 271, 20)); + startupFileTextfield.setBounds(new Rectangle(172, 273, 270, 20)); startupFileTextfield.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) @@ -273,7 +283,7 @@ public class GPreferences extends JPanel linkPanel.setLayout(borderLayout2); editLinkButtons.setLayout(gridLayout1); gridLayout1.setRows(3); - linkNameList.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); + linkNameList.setFont(verdana11); linkNameList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); linkPanel2.setLayout(borderLayout3); linkURLList.setFont(verdana11); @@ -303,14 +313,14 @@ public class GPreferences extends JPanel jPanel1.setBorder(titledBorder1); jPanel1.setLayout(gridBagLayout1); sortby.setFont(verdana11); - sortby.setBounds(new Rectangle(170, 200, 155, 21)); + sortby.setBounds(new Rectangle(172, 249, 155, 21)); sortLabel.setFont(verdana11); sortLabel.setHorizontalAlignment(SwingConstants.RIGHT); sortLabel.setText("Sort by "); - jPanel2.setBounds(new Rectangle(7, 17, 158, 242)); + jPanel2.setBounds(new Rectangle(7, 17, 158, 278)); jPanel2.setLayout(gridLayout2); - gridLayout2.setRows(8); - jPanel3.setBounds(new Rectangle(168, 47, 274, 26)); + gridLayout2.setRows(12); + jPanel3.setBounds(new Rectangle(173, 35, 274, 26)); exportTab.setLayout(null); epsLabel.setFont(verdana11); epsLabel.setHorizontalAlignment(SwingConstants.RIGHT); @@ -333,7 +343,7 @@ public class GPreferences extends JPanel msfjv.setFont(verdana11); msfjv.setHorizontalAlignment(SwingConstants.LEFT); pirjv.setText("PIR "); - jPanel11.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + jPanel11.setFont(verdana11); jPanel11.setBorder(titledBorder2); jPanel11.setBounds(new Rectangle(30, 72, 196, 182)); jPanel11.setLayout(gridLayout3); @@ -347,30 +357,62 @@ public class GPreferences extends JPanel pileupjv.setHorizontalAlignment(SwingConstants.LEFT); pirjv.setFont(verdana11); pirjv.setHorizontalAlignment(SwingConstants.LEFT); - seqLimit.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + seqLimit.setFont(verdana11); seqLimit.setHorizontalAlignment(SwingConstants.RIGHT); - seqLimit.setHorizontalTextPosition(SwingConstants.LEADING); + seqLimit.setHorizontalTextPosition(SwingConstants.LEFT); seqLimit.setText("Full Sequence Id"); gridLayout3.setRows(8); + smoothFont.setFont(verdana11); + smoothFont.setHorizontalAlignment(SwingConstants.RIGHT); + smoothFont.setHorizontalTextPosition(SwingConstants.LEADING); + smoothFont.setText("Smooth Font"); + calcTab.setLayout(null); + autoCalculateConsCheck.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + autoCalculateConsCheck.setText("AutoCalculate Consensus"); + autoCalculateConsCheck.setBounds(new Rectangle(21, 52, 209, 23)); + padGaps.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + padGaps.setText("Pad gaps when editing"); + padGaps.setBounds(new Rectangle(22, 94, 168, 23)); + modellerOutput.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + 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"); + rightAlign.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + rightAlign.setForeground(Color.black); + rightAlign.setHorizontalAlignment(SwingConstants.RIGHT); + rightAlign.setHorizontalTextPosition(SwingConstants.LEFT); + rightAlign.setText("Right Align Ids"); + idItalics.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + idItalics.setHorizontalAlignment(SwingConstants.RIGHT); + idItalics.setHorizontalTextPosition(SwingConstants.LEADING); + idItalics.setText("Sequence Name Italics"); jPanel2.add(fullScreen); jPanel2.add(annotations); jPanel2.add(seqLimit); + jPanel2.add(rightAlign); jPanel2.add(fontLabel); + jPanel2.add(idItalics); + jPanel2.add(smoothFont); + jPanel2.add(wrap); jPanel2.add(gapLabel); jPanel2.add(colourLabel); jPanel2.add(sortLabel); jPanel2.add(startupCheckbox); - visualTab.add(gapSymbolCB); + visualTab.add(startupFileTextfield); + visualTab.add(sortby); visualTab.add(colour); + visualTab.add(gapSymbolCB); visualTab.add(jPanel3); - jPanel3.add(conservation); - jPanel3.add(identity); - jPanel3.add(quality); - visualTab.add(sortby); - visualTab.add(startupFileTextfield); visualTab.add(fontNameCB); visualTab.add(fontSizeCB); visualTab.add(fontStyleCB); + jPanel3.add(conservation); + jPanel3.add(identity); + jPanel3.add(quality); visualTab.add(jPanel2); linkPanel.add(editLinkButtons, BorderLayout.EAST); editLinkButtons.add(newLink, null); @@ -432,6 +474,12 @@ public class GPreferences extends JPanel jPanel11.add(pfamjv); jPanel11.add(pileupjv); jPanel11.add(pirjv); + exportTab.add(modellerOutput); + tabbedPane.add(calcTab, "Editing"); + calcTab.add(autoCalculateConsCheck); + calcTab.add(padGaps); + tabbedPane.add(dasPanel, "DAS Settings"); + exportTab.add(epsLabel); exportTab.add(epsRendering); exportTab.add(jPanel11); @@ -500,4 +548,5 @@ public class GPreferences extends JPanel proxyServerTB.setEnabled(useProxy.isSelected()); proxyPortTB.setEnabled(useProxy.isSelected()); } + }