X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=f9b7ba9671073bbf3497981ee6b9877d95362690;hb=9d701bbe1b456aac498c5665cb3d7ac00a58db57;hp=8f30fb320a2490a52dfe2ceb2812976112940ce4;hpb=9bea55eea55110a19b17d0127903802013fa60ea;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 8f30fb3..f9b7ba9 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -5,6 +5,8 @@ import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import javax.swing.border.TitledBorder; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; public class GPreferences extends JPanel @@ -50,17 +52,18 @@ public class GPreferences quality.setText("Quality"); quality.setBounds(new Rectangle(248, 53, 81, 23)); jPanel2.setBorder(titledBorder1); - jPanel2.setBounds(new Rectangle(9, 20, 442, 206)); + jPanel2.setBounds(new Rectangle(9, 20, 442, 241)); jPanel2.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)); fullScreen.setHorizontalAlignment(SwingConstants.RIGHT); fullScreen.setHorizontalTextPosition(SwingConstants.LEFT); - fullScreen.setText("Full Screen"); - fullScreen.setBounds(new Rectangle(31, 28, 107, 23)); + fullScreen.setText("Maximise Window"); + fullScreen.setBounds(new Rectangle(5, 29, 132, 23)); conservation.setEnabled(false); conservation.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); conservation.setHorizontalAlignment(SwingConstants.RIGHT); @@ -73,7 +76,7 @@ public class GPreferences identity.setHorizontalAlignment(SwingConstants.RIGHT); identity.setHorizontalTextPosition(SwingConstants.LEFT); identity.setSelected(true); - identity.setText("% Identity"); + identity.setText("Consensus"); identity.setBounds(new Rectangle(326, 53, 99, 23)); annotations.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); annotations.setHorizontalAlignment(SwingConstants.RIGHT); @@ -110,8 +113,30 @@ public class GPreferences fontNameCB.setBounds(new Rectangle(121, 109, 183, 21)); gapSymbolCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); gapSymbolCB.setBounds(new Rectangle(121, 140, 67, 21)); + startupCheckbox.setText("Open file"); + startupCheckbox.setBounds(new Rectangle(4, 200, 115, 23)); + startupCheckbox.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + jCheckBox1_actionPerformed(e); + } + }); + 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(122, 202, 309, 20)); + startupFileTextfield.addMouseListener(new MouseAdapter() + { + public void mouseClicked(MouseEvent e) + { + startupFileTextfield_mouseClicked(); + } + }); + jPanel2.add(annotations); - jPanel2.add(fullScreen); jPanel2.add(conservation); jPanel2.add(quality); jPanel2.add(fullID); @@ -124,13 +149,15 @@ public class GPreferences jPanel2.add(fontSizeCB); jPanel2.add(fontStyleCB); jPanel2.add(identity); + jPanel2.add(fullScreen); + jPanel2.add(startupCheckbox); + jPanel2.add(startupFileTextfield); jPanel1.add(ok); jPanel1.add(cancel); this.add(visaulTab, java.awt.BorderLayout.CENTER); visaulTab.add(visual, "visual"); visual.add(jPanel2); this.add(jPanel1, java.awt.BorderLayout.SOUTH); - DefaultListCellRenderer dlcr = new DefaultListCellRenderer(); dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER); gapSymbolCB.setRenderer(dlcr); @@ -159,6 +186,8 @@ public class GPreferences protected JComboBox fontStyleCB = new JComboBox(); protected JComboBox fontNameCB = new JComboBox(); protected JComboBox gapSymbolCB = new JComboBox(); + protected JCheckBox startupCheckbox = new JCheckBox(); + protected JTextField startupFileTextfield = new JTextField(); public void ok_actionPerformed(ActionEvent e) { @@ -174,4 +203,15 @@ public class GPreferences } + public void jCheckBox1_actionPerformed(ActionEvent e) + { + + } + + + public void startupFileTextfield_mouseClicked() + { + + } + }