X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=320592e54e3842da9c069879bc947b59d4737681;hb=eee02848424734a9466de35ff19636377652e59b;hp=ab1d4e7afb2b74b83939f40b5012b7e0d90e2db3;hpb=e5c2e37b24f09c90f2f7c748f6be10ce025da261;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index ab1d4e7..320592e 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -84,6 +84,11 @@ public class GPreferences extends JPanel GridBagLayout gridBagLayout3 = new GridBagLayout(); protected JComboBox sortby = new JComboBox(); JLabel sortLabel = new JLabel(); + JPanel jPanel2 = new JPanel(); + GridLayout gridLayout2 = new GridLayout(); + JLabel jLabel1 = new JLabel(); + JPanel jPanel3 = new JPanel(); + protected JComboBox epsRendering = new JComboBox(); /** * Creates a new GPreferences object. */ @@ -129,41 +134,37 @@ public class GPreferences extends JPanel quality.setHorizontalTextPosition(SwingConstants.LEFT); quality.setSelected(true); quality.setText("Quality"); - quality.setBounds(new Rectangle(248, 53, 81, 23)); - visualTab.setBorder(new TitledBorder("Open new alignment")); - visualTab.setBounds(new Rectangle(9, 20, 442, 241)); - visualTab.setLayout(null); + visualTab.setBorder(new TitledBorder("Open new alignment")); + visualTab.setLayout(null); fullID.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); fullID.setHorizontalAlignment(SwingConstants.RIGHT); fullID.setHorizontalTextPosition(SwingConstants.LEFT); - fullID.setText("Full Sequence ID"); - fullID.setBounds(new Rectangle(9, 78, 129, 23)); - fullScreen.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + fullID.setMargin(new Insets(4, 2, 2, 0)); + fullID.setText("Full Sequence ID"); + fullScreen.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); fullScreen.setHorizontalAlignment(SwingConstants.RIGHT); fullScreen.setHorizontalTextPosition(SwingConstants.LEFT); - fullScreen.setText("Maximise Window"); - fullScreen.setBounds(new Rectangle(5, 29, 132, 23)); - conservation.setEnabled(false); + fullScreen.setMargin(new Insets(2, 2, 2, 0)); + fullScreen.setText("Maximise Window"); + conservation.setEnabled(false); conservation.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); conservation.setHorizontalAlignment(SwingConstants.RIGHT); conservation.setHorizontalTextPosition(SwingConstants.LEFT); conservation.setSelected(true); conservation.setText("Conservation"); - conservation.setBounds(new Rectangle(137, 53, 113, 23)); - identity.setEnabled(false); + identity.setEnabled(false); identity.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); identity.setHorizontalAlignment(SwingConstants.RIGHT); identity.setHorizontalTextPosition(SwingConstants.LEFT); identity.setSelected(true); identity.setText("Consensus"); - identity.setBounds(new Rectangle(326, 53, 99, 23)); - annotations.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + annotations.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); annotations.setHorizontalAlignment(SwingConstants.RIGHT); annotations.setHorizontalTextPosition(SwingConstants.LEFT); - annotations.setSelected(true); + annotations.setMargin(new Insets(2, 4, 2, 0)); + annotations.setSelected(true); annotations.setText("Show Annotations"); - annotations.setBounds(new Rectangle(10, 53, 128, 23)); - annotations.addActionListener(new ActionListener() + annotations.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -173,33 +174,29 @@ public class GPreferences extends JPanel gapLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); gapLabel.setHorizontalAlignment(SwingConstants.RIGHT); gapLabel.setText("Gap Symbol"); - gapLabel.setBounds(new Rectangle(41, 142, 76, 15)); - colour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - colour.setBounds(new Rectangle(121, 168, 154, 21)); + colour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + colour.setBounds(new Rectangle(154, 151, 154, 21)); colourLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); colourLabel.setText("Colour"); - colourLabel.setBounds(new Rectangle(60, 172, 58, 15)); - fontLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + fontLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); fontLabel.setHorizontalAlignment(SwingConstants.RIGHT); fontLabel.setText("Font"); - fontLabel.setBounds(new Rectangle(83, 114, 34, 15)); - fontSizeCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - fontSizeCB.setBounds(new Rectangle(304, 109, 49, 21)); + fontSizeCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + fontSizeCB.setBounds(new Rectangle(322, 98, 49, 21)); fontStyleCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - fontStyleCB.setBounds(new Rectangle(353, 109, 80, 21)); + fontStyleCB.setBounds(new Rectangle(370, 98, 70, 21)); fontNameCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - fontNameCB.setBounds(new Rectangle(121, 109, 183, 21)); + fontNameCB.setBounds(new Rectangle(153, 98, 169, 21)); gapSymbolCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - gapSymbolCB.setBounds(new Rectangle(121, 140, 67, 21)); + gapSymbolCB.setBounds(new Rectangle(154, 125, 67, 21)); startupCheckbox.setText("Open file"); - startupCheckbox.setBounds(new Rectangle(4, 200, 115, 23)); - startupCheckbox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + startupCheckbox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT); startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT); startupCheckbox.setSelected(true); startupFileTextfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - startupFileTextfield.setBounds(new Rectangle(121, 200, 309, 20)); + startupFileTextfield.setBounds(new Rectangle(154, 204, 285, 20)); startupFileTextfield.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) @@ -297,32 +294,41 @@ public class GPreferences extends JPanel jPanel1.setBorder(titledBorder1); jPanel1.setLayout(gridBagLayout1); sortby.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - sortby.setBounds(new Rectangle(122, 232, 308, 21)); + sortby.setBounds(new Rectangle(154, 178, 286, 21)); sortLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); sortLabel.setHorizontalAlignment(SwingConstants.RIGHT); sortLabel.setText("Sort by"); - sortLabel.setBounds(new Rectangle(53, 235, 64, 15)); - visualTab.add(annotations); - visualTab.add(conservation); - visualTab.add(quality); - visualTab.add(fullID); - visualTab.add(gapSymbolCB); - visualTab.add(fontLabel); - visualTab.add(fontNameCB); - visualTab.add(colourLabel); - visualTab.add(gapLabel); + jPanel2.setBounds(new Rectangle(7, 19, 141, 242)); + jPanel2.setLayout(gridLayout2); + gridLayout2.setRows(9); + jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + jLabel1.setHorizontalAlignment(SwingConstants.RIGHT); + jLabel1.setText("EPS Rendering Style"); + jPanel3.setBounds(new Rectangle(149, 42, 278, 26)); + epsRendering.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + epsRendering.setBounds(new Rectangle(154, 228, 286, 21)); + jPanel2.add(fullScreen); + jPanel2.add(annotations); + jPanel2.add(fullID); + jPanel2.add(fontLabel); + jPanel2.add(gapLabel); + jPanel2.add(colourLabel); + jPanel2.add(sortLabel); + jPanel2.add(startupCheckbox); + jPanel2.add(jLabel1); + visualTab.add(jPanel3); + jPanel3.add(conservation); + jPanel3.add(quality); + jPanel3.add(identity); + visualTab.add(fontNameCB); + visualTab.add(fontSizeCB); + visualTab.add(fontStyleCB); + visualTab.add(gapSymbolCB); visualTab.add(colour); - visualTab.add(fontSizeCB); - visualTab.add(fontStyleCB); - visualTab.add(identity); - visualTab.add(fullScreen); - visualTab.add(startupCheckbox); - visualTab.add(startupFileTextfield); visualTab.add(sortby); - visualTab.add(sortLabel); - - tabbedPane.add(visualTab, "Visual"); - tabbedPane.add(connectTab, "Connections"); + visualTab.add(startupFileTextfield); + visualTab.add(epsRendering); + visualTab.add(jPanel2); linkPanel.add(editLinkButtons, BorderLayout.EAST); editLinkButtons.add(newLink, null); @@ -362,6 +368,7 @@ public class GPreferences extends JPanel connectTab.add(defaultBrowser, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0 , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(15, 0, 0, 15), 307, 1)); + jPanel1.add(useProxy, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0 , GridBagConstraints.WEST, GridBagConstraints.NONE, @@ -370,6 +377,9 @@ public class GPreferences extends JPanel DefaultListCellRenderer dlcr = new DefaultListCellRenderer(); dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER); gapSymbolCB.setRenderer(dlcr); + + tabbedPane.add(visualTab, "Visual"); + tabbedPane.add(connectTab, "Connections"); } /**