X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=d2d30911e80bda9f378546e2d816f01f1c947c70;hb=27e04880edb301447f2e57b5156b8c685b853b68;hp=d0f9b7f629e73b449ee0e5d3d2750ea3833fc686;hpb=05cc1e453976137138e0d24ba0264b8e5f35b628;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index d0f9b7f..d2d3091 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 @@ -113,6 +113,7 @@ public class GPreferences extends JPanel protected JPanel dasPanel = new JPanel(); BorderLayout borderLayout4 = new BorderLayout(); protected JCheckBox wrap = new JCheckBox(); + protected JCheckBox rightAlign = new JCheckBox(); /** * Creates a new GPreferences object. */ @@ -194,7 +195,7 @@ public class GPreferences extends JPanel gapLabel.setHorizontalAlignment(SwingConstants.RIGHT); gapLabel.setText("Gap Symbol "); colour.setFont(verdana11); - colour.setBounds(new Rectangle(172, 188, 155, 21)); + colour.setBounds(new Rectangle(172, 203, 155, 21)); colourLabel.setFont(verdana11); colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); colourLabel.setText("Colour "); @@ -202,20 +203,20 @@ public class GPreferences extends JPanel fontLabel.setHorizontalAlignment(SwingConstants.RIGHT); fontLabel.setText("Font "); fontSizeCB.setFont(verdana11); - fontSizeCB.setBounds(new Rectangle(317, 92, 49, 21)); + fontSizeCB.setBounds(new Rectangle(319, 111, 49, 21)); fontStyleCB.setFont(verdana11); - fontStyleCB.setBounds(new Rectangle(364, 92, 70, 21)); + fontStyleCB.setBounds(new Rectangle(367, 111, 70, 21)); fontNameCB.setFont(verdana11); - fontNameCB.setBounds(new Rectangle(171, 92, 147, 21)); + fontNameCB.setBounds(new Rectangle(172, 111, 147, 21)); gapSymbolCB.setFont(verdana11); - gapSymbolCB.setBounds(new Rectangle(172, 163, 69, 21)); + gapSymbolCB.setBounds(new Rectangle(172, 179, 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, 249, 270, 20)); startupFileTextfield.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) @@ -313,13 +314,13 @@ public class GPreferences extends JPanel jPanel1.setBorder(titledBorder1); jPanel1.setLayout(gridBagLayout1); sortby.setFont(verdana11); - sortby.setBounds(new Rectangle(171, 213, 155, 21)); + sortby.setBounds(new Rectangle(172, 225, 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, 257)); jPanel2.setLayout(gridLayout2); - gridLayout2.setRows(10); + gridLayout2.setRows(11); jPanel3.setBounds(new Rectangle(169, 39, 274, 26)); exportTab.setLayout(null); epsLabel.setFont(verdana11); @@ -382,10 +383,15 @@ public class GPreferences extends JPanel wrap.setHorizontalAlignment(SwingConstants.TRAILING); wrap.setHorizontalTextPosition(SwingConstants.LEADING); wrap.setText("Wrap Alignment"); + rightAlign.setForeground(Color.black); + rightAlign.setHorizontalAlignment(SwingConstants.RIGHT); + rightAlign.setHorizontalTextPosition(SwingConstants.LEADING); + rightAlign.setText("Right Align Ids"); jPanel2.add(fullScreen); jPanel2.add(annotations); jPanel2.add(seqLimit); + jPanel2.add(rightAlign); jPanel2.add(fontLabel); jPanel2.add(smoothFont); jPanel2.add(wrap); @@ -393,14 +399,14 @@ public class GPreferences extends JPanel jPanel2.add(colourLabel); jPanel2.add(sortLabel); jPanel2.add(startupCheckbox); - visualTab.add(sortby); - visualTab.add(gapSymbolCB); - visualTab.add(colour); visualTab.add(fontNameCB); visualTab.add(fontSizeCB); visualTab.add(fontStyleCB); - visualTab.add(jPanel3); visualTab.add(startupFileTextfield); + visualTab.add(gapSymbolCB); + visualTab.add(colour); + visualTab.add(sortby); + visualTab.add(jPanel3); jPanel3.add(conservation); jPanel3.add(identity); jPanel3.add(quality);