X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=d0f9b7f629e73b449ee0e5d3d2750ea3833fc686;hb=e2b36c74f66364df200d911fa36c2ec4a541b529;hp=8b10c5f170a55b5818385b3cb4bd2079801131ab;hpb=ba7dbc4f57fff0625adb04363ccbc59d3f16dfdc;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 8b10c5f..d0f9b7f 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -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! @@ -104,6 +106,13 @@ public class GPreferences extends JPanel 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(); /** * Creates a new GPreferences object. */ @@ -171,7 +180,7 @@ 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.setMargin(new Insets(2, 2, 2, 0)); annotations.setSelected(true); annotations.setText("Show Annotations"); annotations.addActionListener(new ActionListener() @@ -185,7 +194,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 "); @@ -193,13 +202,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); @@ -304,14 +313,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); @@ -351,30 +360,47 @@ public class GPreferences extends JPanel seqLimit.setFont(verdana11); seqLimit.setHorizontalAlignment(SwingConstants.RIGHT); seqLimit.setHorizontalTextPosition(SwingConstants.LEFT); + seqLimit.setMargin(new Insets(2, 2, 2, 0)); 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"); 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); @@ -439,6 +465,11 @@ 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);