From 0dcafd41725e30848c8ce8a279e4d6f9bf2f5eba Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 14 Sep 2005 11:24:13 +0000 Subject: [PATCH] Add Export tab --- src/jalview/jbgui/GPreferences.java | 59 +++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 320592e..8c3f937 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -86,8 +86,9 @@ public class GPreferences extends JPanel JLabel sortLabel = new JLabel(); JPanel jPanel2 = new JPanel(); GridLayout gridLayout2 = new GridLayout(); - JLabel jLabel1 = new JLabel(); JPanel jPanel3 = new JPanel(); + JPanel exportTab = new JPanel(); + JLabel epsLabel = new JLabel(); protected JComboBox epsRendering = new JComboBox(); /** * Creates a new GPreferences object. @@ -173,30 +174,30 @@ public class GPreferences extends JPanel }); gapLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); gapLabel.setHorizontalAlignment(SwingConstants.RIGHT); - gapLabel.setText("Gap Symbol"); + gapLabel.setText("Gap Symbol "); colour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - colour.setBounds(new Rectangle(154, 151, 154, 21)); + colour.setBounds(new Rectangle(147, 189, 154, 21)); colourLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); - colourLabel.setText("Colour"); + colourLabel.setText("Colour "); fontLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); fontLabel.setHorizontalAlignment(SwingConstants.RIGHT); - fontLabel.setText("Font"); + fontLabel.setText("Font "); fontSizeCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - fontSizeCB.setBounds(new Rectangle(322, 98, 49, 21)); + fontSizeCB.setBounds(new Rectangle(316, 124, 49, 21)); fontStyleCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - fontStyleCB.setBounds(new Rectangle(370, 98, 70, 21)); + fontStyleCB.setBounds(new Rectangle(364, 124, 70, 21)); fontNameCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - fontNameCB.setBounds(new Rectangle(153, 98, 169, 21)); + fontNameCB.setBounds(new Rectangle(147, 124, 169, 21)); gapSymbolCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - gapSymbolCB.setBounds(new Rectangle(154, 125, 67, 21)); + gapSymbolCB.setBounds(new Rectangle(147, 156, 67, 21)); startupCheckbox.setText("Open file"); 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(154, 204, 285, 20)); + startupFileTextfield.setBounds(new Rectangle(147, 255, 302, 20)); startupFileTextfield.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) @@ -294,19 +295,21 @@ 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(154, 178, 286, 21)); + sortby.setBounds(new Rectangle(147, 222, 302, 21)); sortLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); sortLabel.setHorizontalAlignment(SwingConstants.RIGHT); - sortLabel.setText("Sort by"); - jPanel2.setBounds(new Rectangle(7, 19, 141, 242)); + sortLabel.setText("Sort by "); + jPanel2.setBounds(new Rectangle(7, 19, 138, 270)); 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)); + gridLayout2.setRows(8); + jPanel3.setBounds(new Rectangle(146, 53, 274, 26)); + exportTab.setLayout(null); + epsLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + epsLabel.setHorizontalAlignment(SwingConstants.RIGHT); + epsLabel.setText("EPS Rendering Style"); + epsLabel.setBounds(new Rectangle(3, 47, 134, 21)); epsRendering.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - epsRendering.setBounds(new Rectangle(154, 228, 286, 21)); + epsRendering.setBounds(new Rectangle(145, 47, 286, 21)); jPanel2.add(fullScreen); jPanel2.add(annotations); jPanel2.add(fullID); @@ -315,11 +318,6 @@ public class GPreferences extends JPanel 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); @@ -327,7 +325,10 @@ public class GPreferences extends JPanel visualTab.add(colour); visualTab.add(sortby); visualTab.add(startupFileTextfield); - visualTab.add(epsRendering); + visualTab.add(jPanel3); + jPanel3.add(conservation); + jPanel3.add(quality); + jPanel3.add(identity); visualTab.add(jPanel2); linkPanel.add(editLinkButtons, BorderLayout.EAST); @@ -340,7 +341,7 @@ public class GPreferences extends JPanel linkPanel2.add(linkNameList, BorderLayout.WEST); okCancelPanel.add(ok); okCancelPanel.add(cancel); - this.add(tabbedPane, java.awt.BorderLayout.CENTER); + this.add(tabbedPane, java.awt.BorderLayout.CENTER); this.add(okCancelPanel, java.awt.BorderLayout.SOUTH); jPanel1.add(serverLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0 @@ -369,6 +370,9 @@ public class GPreferences extends JPanel , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(15, 0, 0, 15), 307, 1)); + exportTab.add(epsLabel); + exportTab.add(epsRendering); + jPanel1.add(useProxy, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0 , GridBagConstraints.WEST, GridBagConstraints.NONE, @@ -380,7 +384,8 @@ public class GPreferences extends JPanel tabbedPane.add(visualTab, "Visual"); tabbedPane.add(connectTab, "Connections"); - } + tabbedPane.add(exportTab, "Export"); + } /** * DOCUMENT ME! -- 1.7.10.2