X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=1ca0802af1c1a2a8ef715df1ff8bd106cdcff761;hb=e1cb1f4ff4ae05504c806d99395358629c807956;hp=f8fd47b14687a633612ce2c76013339d24647aaa;hpb=b02e2d7bed980ad4c50112575f4253494b993ee2;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index f8fd47b..1ca0802 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -183,8 +183,6 @@ public class GPreferences extends JPanel /* * Overview tab components */ - protected JPanel overviewTab; - protected JPanel gapColour = new JPanel(); protected JPanel hiddenColour = new JPanel(); @@ -1023,18 +1021,22 @@ public class GPreferences extends JPanel MessageManager.getString("label.ov_legacy_gap")); useLegacyGap.setFont(LABEL_FONT); useLegacyGap.setHorizontalAlignment(SwingConstants.LEFT); + useLegacyGap.setVerticalTextPosition(SwingConstants.TOP); gapLabel = new JLabel( MessageManager.getString("label.gap_colour")); gapLabel.setFont(LABEL_FONT); gapLabel.setHorizontalAlignment(SwingConstants.LEFT); + gapLabel.setVerticalTextPosition(SwingConstants.TOP); showHiddenAtStart = new JCheckBox( MessageManager.getString("label.ov_show_hide_default")); showHiddenAtStart.setFont(LABEL_FONT); showHiddenAtStart.setHorizontalAlignment(SwingConstants.LEFT); + showHiddenAtStart.setVerticalTextPosition(SwingConstants.TOP); JLabel hiddenLabel = new JLabel( MessageManager.getString("label.hidden_colour")); hiddenLabel.setFont(LABEL_FONT); hiddenLabel.setHorizontalAlignment(SwingConstants.LEFT); + hiddenLabel.setVerticalTextPosition(SwingConstants.TOP); useLegacyGap.addActionListener(new ActionListener() { @@ -1091,10 +1093,30 @@ public class GPreferences extends JPanel c6.insets = new Insets(0, 0, 0, 15); overviewPanel.add(hiddenColour, c6); + JButton resetButton = new JButton( + MessageManager.getString("label.reset_to_defaults")); + + resetButton.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + resetOvDefaults_actionPerformed(e); + } + }); + + GridBagConstraints c7 = new GridBagConstraints(); + c7.fill = GridBagConstraints.NONE; + c7.gridx = 0; + c7.gridy = 2; + c7.insets = new Insets(10, 0, 0, 0); + c7.anchor = GridBagConstraints.WEST; + overviewPanel.add(resetButton, c7); + // Add padding so the panel doesn't look ridiculous JPanel spacePanel = new JPanel(); overviewPanel.add(spacePanel, - new GridBagConstraints(0, 2, 1, 1, 1.0, 1.0, + new GridBagConstraints(0, 3, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 5), 0, 0)); @@ -1649,13 +1671,10 @@ public class GPreferences extends JPanel protected void useLegacyGaps_actionPerformed(ActionEvent e) { - boolean enabled = useLegacyGap.isSelected(); - if (enabled) - { - gapColour.setBackground(Color.WHITE); - } - gapColour.setEnabled(!enabled); - gapLabel.setEnabled(!enabled); + } + + protected void resetOvDefaults_actionPerformed(ActionEvent e) + { } /**