X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=2b194bf36078d4155f5b2a8e6992328acf6284c2;hb=5dd663636925f44c6f964fa32fed2f584223b295;hp=8a51aee08f62659fbba1702f0257b4910912e242;hpb=38299bef6dfd4b713f615781e631dcb66e1155f2;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 8a51aee..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! @@ -108,6 +110,11 @@ public class GPreferences extends 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. */ @@ -158,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); @@ -175,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() @@ -189,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, 225, 155, 21)); colourLabel.setFont(verdana11); colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); colourLabel.setText("Colour "); @@ -197,20 +202,20 @@ 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(319, 111, 49, 21)); fontStyleCB.setFont(verdana11); - fontStyleCB.setBounds(new Rectangle(366, 100, 70, 21)); + fontStyleCB.setBounds(new Rectangle(367, 111, 70, 21)); fontNameCB.setFont(verdana11); - fontNameCB.setBounds(new Rectangle(171, 100, 147, 21)); + fontNameCB.setBounds(new Rectangle(172, 111, 147, 21)); gapSymbolCB.setFont(verdana11); - gapSymbolCB.setBounds(new Rectangle(171, 153, 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(171, 236, 270, 20)); + startupFileTextfield.setBounds(new Rectangle(172, 273, 270, 20)); startupFileTextfield.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) @@ -308,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(172, 249, 155, 21)); sortLabel.setFont(verdana11); sortLabel.setHorizontalAlignment(SwingConstants.RIGHT); sortLabel.setText("Sort by "); - jPanel2.setBounds(new Rectangle(7, 17, 158, 245)); + jPanel2.setBounds(new Rectangle(7, 17, 158, 278)); jPanel2.setLayout(gridLayout2); - gridLayout2.setRows(9); - jPanel3.setBounds(new Rectangle(167, 41, 274, 26)); + gridLayout2.setRows(12); + jPanel3.setBounds(new Rectangle(173, 35, 274, 26)); exportTab.setLayout(null); epsLabel.setFont(verdana11); epsLabel.setHorizontalAlignment(SwingConstants.RIGHT); @@ -371,24 +376,40 @@ public class GPreferences extends JPanel 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(colour); - visualTab.add(gapSymbolCB); visualTab.add(startupFileTextfield); visualTab.add(sortby); + visualTab.add(colour); + visualTab.add(gapSymbolCB); + visualTab.add(jPanel3); visualTab.add(fontNameCB); visualTab.add(fontSizeCB); visualTab.add(fontStyleCB); - visualTab.add(jPanel3); jPanel3.add(conservation); jPanel3.add(identity); jPanel3.add(quality); @@ -454,9 +475,10 @@ public class GPreferences extends JPanel jPanel11.add(pileupjv); jPanel11.add(pirjv); exportTab.add(modellerOutput); - tabbedPane.add(calcTab, "Calculations"); + tabbedPane.add(calcTab, "Editing"); calcTab.add(autoCalculateConsCheck); calcTab.add(padGaps); + tabbedPane.add(dasPanel, "DAS Settings"); exportTab.add(epsLabel); exportTab.add(epsRendering); @@ -526,4 +548,5 @@ public class GPreferences extends JPanel proxyServerTB.setEnabled(useProxy.isSelected()); proxyPortTB.setEnabled(useProxy.isSelected()); } + }